From 5b8963ed8d66e1800efbc3187229719526540700 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 18 Sep 2023 13:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/po/CsEquipmentProcessPO.java   | 3 +++
 .../com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java     | 2 ++
 .../controller/equipment/EquipmentDeliveryController.java | 8 ++++----
 .../csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml | 3 ++-
 .../njcn/csdevice/service/CsEquipmentDeliveryService.java | 4 ++--
 .../service/impl/CsEquipmentDeliveryServiceImpl.java      | 6 ++++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentProcessPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentProcessPO.java
index 0b342ff..7179d8f 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentProcessPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentProcessPO.java
@@ -61,4 +61,7 @@ public class CsEquipmentProcessPO {
     @TableField(value = "status")
     private Integer status;
 
+    @TableField(value = "remark")
+    private String remark;
+
 }
\ No newline at end of file
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 249b711..18a0359 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
@@ -43,6 +43,8 @@ public class ProjectEquipmentVO  {
     @ApiModelProperty(value = "设备名称")
     private String equipmentName;
 
+    private String process;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
     @ApiModelProperty(value = "是否是主用户0-否，1-是")
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
index 92a5bb1..caa4600 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -222,18 +222,18 @@ public class EquipmentDeliveryController extends BaseController {
     @ResponseBody
     @ApiOperation("联调完成")
     @PostMapping(value = "testcompletion")
-    public HttpResult<String> testCompletion(@RequestParam("deviceId") String deviceId,@RequestParam("type") String type){
+    public HttpResult<String> testCompletion(@RequestParam("deviceId") String deviceId,@RequestParam("type") String type,@RequestParam("remark") String remark){
         String methodDescribe = getMethodDescribe("testCompletion");
-        csEquipmentDeliveryService.testCompletion(deviceId,type);
+        csEquipmentDeliveryService.testCompletion(deviceId,type, remark);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
     @ResponseBody
     @ApiOperation("取消联调")
     @PostMapping(value = "deleteTest")
-    public HttpResult<String> deleteTest(@RequestParam("deviceId") String deviceId,@RequestParam("type") String type){
+    public HttpResult<String> deleteTest(@RequestParam("deviceId") String deviceId,@RequestParam("type") String type,@RequestParam("remark") String remark){
         String methodDescribe = getMethodDescribe("testCompletion");
-        csEquipmentDeliveryService.deleteTest(deviceId,type);
+        csEquipmentDeliveryService.deleteTest(deviceId,type, remark);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
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 71dc0d9..064f924 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.name equipmentName,
         c.create_time createTime,
         c.run_status,
-        c.mac mac
+        c.mac mac,
+        c.process process
         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/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
index 926e5c7..d998b41 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
@@ -97,7 +97,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
 
     void delete(String devId);
 
-    void testCompletion(String deviceId,String type);
+    void testCompletion(String deviceId,String type,String remark);
 
-    void deleteTest(String deviceId, String type);
+    void deleteTest(String deviceId, String type,String remark);
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index d7ff747..642289f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -471,7 +471,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void testCompletion(String deviceId,String type) {
+    public void testCompletion(String deviceId,String type,String remark) {
         CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
         this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
                 set(CsEquipmentDeliveryPO::getStatus,0).
@@ -482,11 +482,12 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 eq(CsEquipmentProcessPO::getProcess,type).
                 eq(CsEquipmentProcessPO::getStatus,1).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
+                set(CsEquipmentProcessPO::getRemark,remark).
                 update();
     }
 
     @Override
-    public void deleteTest(String deviceId, String type) {
+    public void deleteTest(String deviceId, String type ,String remark) {
         CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
 
         this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
@@ -498,6 +499,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 eq(CsEquipmentProcessPO::getProcess,type).
                 eq(CsEquipmentProcessPO::getStatus,0).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
+                set(CsEquipmentProcessPO::getRemark,remark).
                 update();
     }