From 3d04e41bfc6ddb50e014967ff64fc8100d46bf6d Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Mon, 15 May 2023 17:31:38 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-15=2017:30:15=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E5=88=A0=E3=80=81=E6=94=B9=E3=80=81=E6=9F=A5?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=85=A5=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E3=80=81=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/psdc/entity/PsdcDevice.java |   4 +-
 .../service/impl/PsdcDeviceServiceImpl.java   |  17 +++-----
 .../mapper/business/PsdcDeviceMapper.xml      |   9 +++++
 .../manager/PsdcDeviceController.java         |  38 +++++++++---------
 .../resources/template/AllDevicesData.xlsx    | Bin 9027 -> 9046 bytes
 5 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
index cfa55f7..7f4a8dc 100644
--- a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
+++ b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
@@ -24,9 +24,6 @@ public class PsdcDevice {
   private Integer parentId;
   /** 用户id */
   private Integer userId ;
-  /** 用户名称 */
-  @Excel(name = "用户名称")
-  private String userName ;
   /** 设备是否可控 */
   private Integer isControl;
 
@@ -51,6 +48,7 @@ public class PsdcDevice {
   @Excel(name = "启用时间")
   private String startTime ;
   /** 设备模型 */
+  @Excel(name = "设备模型")
   private String deviceModel;
 
   /** 设备状态：1-未激活，2-禁用，3-在线，4-离线 */
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index d216f1e..89f0acd 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -87,7 +87,6 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
     public List<PsdcDeviceInfoRes> queryAllByLimit(PsdcDevice psdcDevice) {
         List<PsdcDeviceInfoRes> list = psdcDeviceMapper.queryAllByLimit(psdcDevice);
         List<Integer> ary = new ArrayList<>();
-        List<PsdcDeviceInfoRes> removeList = new ArrayList<>();
         for (PsdcDeviceInfoRes dev : list){
             // 导出时转换为String
             if (null != dev){
@@ -98,16 +97,6 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
                 }
             }
         }
-//        for (PsdcDeviceInfoRes dev : list){
-//            // 剔除多设备父模型
-//            for (Integer pId : ary){
-//                if (dev.getDeviceId() == pId){
-//                    removeList.add(dev);
-//                }
-//            }
-//        }
-//
-//        list.removeAll(removeList);
         return list;
     }
 
@@ -143,12 +132,16 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             for (PsdcDevice pd : devices){
                 pd.setCreateBy(cjr);
                 pd.setCreateTime(new Date());
-                // pd.setDeviceType(Integer.parseInt(pd.getDevType()));
+                // 添加新设备时，默认父模型为根目录
+                pd.setParentId(0);
                 // 新导入的设备默认状态为: 未激活
                 // 新导入的设备默认启动时间为null，请在设备激活后手动修改！
                 pd.setDeviceStatus(1);
+                // 添加新设备时，默认可以在能源监测设备列表显示，可以自己手动修改
+                pd.setDeviceType(2);
                 // 新导入的设备默认运行状态为: 关闭
                 pd.setDeviceRunstatus(2);
+                System.out.println("设备Infos: " + pd + "\n");
             }
             psdcDeviceMapper.saveDevicesData(devices);
             return true;
diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
index b86b868..1c478ad 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
@@ -251,9 +251,15 @@
             <if test="userId != null and userId != ''">
                 user_id = #{userId},
             </if>
+            <if test="parentId != null and parentId != ''">
+                parent_id = #{parentId},
+            </if>
             <if test="deviceType != null and deviceType != ''">
                 device_type = #{deviceType},
             </if>
+            <if test="deviceModel != null and deviceModel != ''">
+                device_model = #{deviceModel},
+            </if>
             <if test="deviceSn != null and deviceSn != ''">
                 device_sn = #{deviceSn},
             </if>
@@ -281,6 +287,9 @@
             <if test="photoUrl != null and photoUrl != ''">
                 photo_url = #{photoUrl},
             </if>
+            <if test="isControl != null and isControl != ''">
+                is_control = #{isControl},
+            </if>
             <if test="createBy != null and createBy != ''">
                 create_by = #{createBy},
             </if>
diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
index e87e3f0..2a3fff9 100644
--- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
@@ -108,12 +108,12 @@ public class PsdcDeviceController extends BaseController {
     @Log(title = "设备管理", businessType = BusinessType.EXPORT)
     @RequestMapping(value = "/daochuDevs", method = RequestMethod.POST)
     public void daochuDevDta(HttpServletResponse response, @RequestBody PsdcDevice pd) {
-//        List<PsdcDevice> list = psdcDeviceService.queryAllByLimit(pd);
-//        for (PsdcDevice dev : list){
-//            dev.setUserName(sysUserService.selectUserById(Long.valueOf(dev.getUserId())).getUserName());
-//        }
-//        ExcelUtil<PsdcDevice> util = new ExcelUtil<>(PsdcDevice.class);
-//        util.exportExcel(response, list, "角色数据");
+        List<PsdcDeviceInfoRes> list = psdcDeviceService.queryAllByLimit(pd);
+        for (PsdcDeviceInfoRes dev : list){
+            dev.setUserName(sysUserService.selectUserById(Long.valueOf(dev.getUserId())).getUserName());
+        }
+        ExcelUtil<PsdcDeviceInfoRes> util = new ExcelUtil<>(PsdcDeviceInfoRes.class);
+        util.exportExcel(response, list, "设备信息数据");
     }
 
     /**
@@ -132,21 +132,19 @@ public class PsdcDeviceController extends BaseController {
         response.setContentType("application/vnd.ms-template;charset=UTF-8");
         // 获取文件的路径
         try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/AllDevicesData.xlsx")) {
-            //读取excel模板
+            // 读取excel模板
             XSSFWorkbook wb = new XSSFWorkbook(inputStream);
-            wb.setSelectedTab(1);
-            XSSFSheet sheet = wb.createSheet("设备类型表");
-            XSSFRow row0 = sheet.createRow(0);
-            XSSFRow row1 = sheet.createRow(1);
-            XSSFRow row2 = sheet.createRow(2);
-            row0.createCell(0).setCellValue("设备类型Id");
-            row0.createCell(1).setCellValue("设备类型名称");
-            row1.createCell(0).setCellValue("1");
-            row1.createCell(1).setCellValue("监测设备");
-            row2.createCell(0).setCellValue("2");
-            row2.createCell(1).setCellValue("运行设备");
-
-
+//            wb.setSelectedTab(1);
+//            XSSFSheet sheet = wb.createSheet("设备类型表");
+//            XSSFRow row0 = sheet.createRow(0);
+//            XSSFRow row1 = sheet.createRow(1);
+//            XSSFRow row2 = sheet.createRow(2);
+//            row0.createCell(0).setCellValue("设备类型Id");
+//            row0.createCell(1).setCellValue("设备类型名称");
+//            row1.createCell(0).setCellValue("1");
+//            row1.createCell(1).setCellValue("监测设备");
+//            row2.createCell(0).setCellValue("2");
+//            row2.createCell(1).setCellValue("运行设备");
             OutputStream os = new BufferedOutputStream(response.getOutputStream());
             wb.write(os);
             os.flush();
diff --git a/psdc-web/src/main/resources/template/AllDevicesData.xlsx b/psdc-web/src/main/resources/template/AllDevicesData.xlsx
index 7f033176e082e58fe64ea5b37d591fa18d79000f..b4c68f14d48ce9a53844939f0f28550f42aaff2b 100644
GIT binary patch
delta 4706
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
B!aD!}

delta 4635
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
C6tG4B