From 5c414cf52c40aa8f51134e4fba0363dde0ed4409 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 4 Aug 2022 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=9A=E5=88=A0=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=8F=AA=E5=89=A9=E5=B7=B2=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8E=E6=B8=85=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9C=AA=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    |  7 ++--
 .../IParamsCollectManifestEOService.java      | 11 +++++-
 .../ParamsCollectManifestEOServiceImpl.java   | 37 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 6ee8b20a4..35994b066 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -173,15 +172,15 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	/**
 	 *  批量删除
 	 *
-	 * @param ids
+	 * @param paramsCollectManifestVO
 	 * @return
 	 */
 	@AutoLog(value = "参数项收集清单-批量删除")
 	@ApiOperation(value="参数项收集清单-批量删除", notes="参数项收集清单-批量删除")
 	@PostMapping(value = "/deleteBatch")
 //	@RequiresPermissions("params:collectManifest:delete")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
+	public Result<?> deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO);
 		if (isSuccess) {
 			return Result.OK("批量删除成功！");
 		} else {
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index 8ba0fa9e6..fac103ab5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -43,13 +43,22 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
     void deleteById(String id);
 
 	/**
-	 * 批量删除
+	 * 批量删除-参数清单页面级
 	 *
 	 * @param ids
 	 * @return
 	 */
 	boolean deleteByIds(List<String> ids);
 
+
+	/**
+	 * 批量删除-参数项收集页面级
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	/**
 	 * 通过id查询
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 91bfb3d99..9da886739 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -235,7 +235,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
     }
 
 	/**
-	 * 批量删除
+	 * 批量删除-参数清单页面级
 	 *
 	 * @param ids
 	 * @return
@@ -247,6 +247,41 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         return removeByIds(ids);
     }
 
+	/**
+	 * 批量删除-参数项收集页面级
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@Override
+    public boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> ids = Arrays.asList(paramsCollectManifestVO.getIds().split(","));
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		// 删除参数项
+		boolean isSuccess = removeByIds(ids);
+		// 关联删除配置数据
+		paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids);
+
+		// 判断清单收集状态
+		Map<String, Object> map = isCollectFinished(paramsManifestId);
+		Boolean finish = (Boolean) map.get("finish");
+		Date time = (Date) map.get("time");
+		if (finish) {
+			// 更新清单状态和完成时间
+			ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
+			updateParamsManifestEO.setId(paramsManifestId);
+			updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
+			updateParamsManifestEO.setFinishTime(time);
+			boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO);
+			if (isSuccess2) {
+				webSocketServer.sendMessage();
+			}
+		}
+
+        return isSuccess;
+    }
+
 	/**
 	 * 通过id查询
 	 *