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 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 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 ids = Arrays.asList(paramsCollectManifestVO.getIds().split(",")); + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + // 删除参数项 + boolean isSuccess = removeByIds(ids); + // 关联删除配置数据 + paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids); + + // 判断清单收集状态 + Map 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查询 *