From 985efbddaae1ebbfcf71ad95de6be4fd29d704a4 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 24 Aug 2023 10:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/param/AppProjectQueryParm.java | 3 ++-
 .../com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java     | 1 +
 .../com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml | 8 +++++---
 .../csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml | 3 ++-
 .../njcn/csdevice/service/impl/AppProjectServiceImpl.java | 7 ++++++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
index c43ca01..27e3527 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * Description:
@@ -30,7 +31,7 @@ public class AppProjectQueryParm {
     private String projectId;
 
     @ApiModelProperty(value="工程id")
-    private String engineeringId;
+    private List<String> engineeringIds;
 
     @ApiModelProperty(value="起始时间")
 //    @NotNull(message="起始时间不能为空！")
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
index 42cce64..249b711 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
@@ -48,5 +48,6 @@ public class ProjectEquipmentVO  {
     @ApiModelProperty(value = "是否是主用户0-否，1-是")
     private String isPrimaryUser;
     private Integer runStatus;
+    private String mac;
 
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
index 2a76555..0cd6ca7 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
@@ -31,9 +31,11 @@
     <if test="temp!=null and temp.projectId != null and temp.projectId !=''">
       AND a.id  = #{temp.projectId}
     </if>
-    <if test="temp!=null and temp.engineeringId != null and temp.engineeringId !=''">
-      AND b.pid = #{temp.engineeringId}
-    </if>
+    AND b.pid in
+    <foreach collection='temp.engineeringIds' item='item' index="index" open='(' separator=',' close=')'>
+      #{item}
+    </foreach>
+
       <if test="temp!=null and temp.endTime != null and temp.endTime !=''">
           AND a.create_time &lt;= #{temp.endTime}"
       </if>
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
index ff80bda..779a433 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
@@ -39,7 +39,8 @@
         c.id equipmentId,
         c.name equipmentName,
         c.create_time createTime,
-        c.run_status
+        c.run_status,
+        c.mac mac
         FROM
         (select * from cs_ledger where LEVEL = 0 ) a,
         (select * from cs_ledger where LEVEL = 1 ) b,
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index 6c73676..66663bf 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.csdevice.pojo.vo.CsLineTopologyTemplateVO;
 import com.njcn.csdevice.service.AppProjectService;
 import com.njcn.csdevice.service.AppTopologyDiagramService;
 import com.njcn.csdevice.service.CsLineTopologyTemplateService;
+import com.njcn.csdevice.service.RoleEngineerDevService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -49,6 +50,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
     private final CsLedgerMapper csLedgerMapper;
     private final CsTopologyDiagramTemplateMapper csTopologyDiagramTemplateMapper;
     private final CsLineTopologyTemplateService csLineTopologyDiagramTemplateService;
+    private final RoleEngineerDevService roleEngineerDevService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean addAppProject(AppProjectAddParm appProjectAddOrAuditParm) {
@@ -256,9 +259,11 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //        if(Objects.equals(RequestUtil.getUsername(),"root")){
 //            userId = null;
 //        }
-        if(StringUtils.isBlank(appProjectQueryParm.getEngineeringId())){
+        List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+        if(CollectionUtils.isEmpty(roleengineer)){
             return returnpage;
         }
+        appProjectQueryParm.setEngineeringIds(roleengineer);
         QueryWrapper<CsLedger> queryWrapper = new QueryWrapper<>();
         returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
         List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {