From 6bd5592109bdf764ca5f9f83762f132da7ee64aa Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 8 Jan 2024 09:55:44 +0800 Subject: [PATCH 1/8] =?UTF-8?q?pert:=20=E7=BB=9F=E4=B8=80=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xydl/cac/controller/BdzController.java | 42 ++++-------- .../cac/controller/IcdConfigController.java | 54 +++++---------- .../com/xydl/cac/controller/JgController.java | 42 ++++-------- .../com/xydl/cac/controller/LxController.java | 40 ++++------- .../xydl/cac/controller/ModevController.java | 52 +++++---------- .../cac/controller/ModevTypeController.java | 52 +++++---------- .../cac/controller/NiecSensorController.java | 66 +++++++------------ .../xydl/cac/controller/ZsbController.java | 44 ++++--------- .../cac/exception/GlobalExceptionHandler.java | 3 + 9 files changed, 124 insertions(+), 271 deletions(-) diff --git a/src/main/java/com/xydl/cac/controller/BdzController.java b/src/main/java/com/xydl/cac/controller/BdzController.java index 9447bc1..991f2e4 100644 --- a/src/main/java/com/xydl/cac/controller/BdzController.java +++ b/src/main/java/com/xydl/cac/controller/BdzController.java @@ -25,48 +25,32 @@ public class BdzController extends BasicController { @GetMapping("listAll") @ApiOperation("查询全部列表") public Response> listAll() { - try { - List result = service.listAll(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Bdz item) { - try { - Bdz result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody Bdz item) throws Exception { + Bdz result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody Bdz item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody Bdz item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") - public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception { + service.delete(id); + return Response.success("OK"); } } diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index 220e377..dd54395 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -42,68 +42,44 @@ public class IcdConfigController extends BasicController { @GetMapping("list") @ApiOperation("查询全部类型列表") - public Response> list(String iedName) { - try { - List result = configService.list(iedName); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response> list(String iedName) throws Exception { + List result = configService.list(iedName); + return Response.success(result); } @GetMapping("iedList") @ApiOperation("查询IED列表") public Response> iedList() { - try { - List result = configService.iedList(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = configService.iedList(); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新ICD类型配置") public Response update(@RequestBody IcdFileConfig item) { - try { - configService.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + configService.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除ICD类型配置") public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - configService.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + configService.delete(id); + return Response.success("OK"); } @GetMapping("tableList") @ApiOperation("查询data表名") - public Response> tableList() { - try { - List result = dataService.getDataTables(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response> tableList() throws Exception { + List result = dataService.getDataTables(); + return Response.success(result); } @GetMapping("colList") @ApiOperation("查询data表字段名") - public Response> colList(String tableName) { - try { - List result = dataService.getDataTableColumns(tableName); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response> colList(String tableName) throws Exception { + List result = dataService.getDataTableColumns(tableName); + return Response.success(result); } } diff --git a/src/main/java/com/xydl/cac/controller/JgController.java b/src/main/java/com/xydl/cac/controller/JgController.java index 7c287e6..b262c40 100644 --- a/src/main/java/com/xydl/cac/controller/JgController.java +++ b/src/main/java/com/xydl/cac/controller/JgController.java @@ -25,48 +25,32 @@ public class JgController extends BasicController { @GetMapping("listAll") @ApiOperation("查询列表") public Response> listAll(Integer bdzid) { - try { - List result = service.listAll(bdzid); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(bdzid); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Jg item) { - try { - Jg result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody Jg item) throws Exception { + Jg result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody Jg item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody Jg item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") - public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception { + service.delete(id); + return Response.success("OK"); } } diff --git a/src/main/java/com/xydl/cac/controller/LxController.java b/src/main/java/com/xydl/cac/controller/LxController.java index db17a09..4be5b10 100644 --- a/src/main/java/com/xydl/cac/controller/LxController.java +++ b/src/main/java/com/xydl/cac/controller/LxController.java @@ -25,48 +25,32 @@ public class LxController extends BasicController { @GetMapping("listAll") @ApiOperation("查询全部列表") public Response> listAll() { - try { - List result = service.listAll(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Lx item) { - try { - Lx result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody Lx item) throws Exception { + Lx result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody Lx item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody Lx item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + service.delete(id); + return Response.success("OK"); } } diff --git a/src/main/java/com/xydl/cac/controller/ModevController.java b/src/main/java/com/xydl/cac/controller/ModevController.java index f3a64c8..62c8899 100644 --- a/src/main/java/com/xydl/cac/controller/ModevController.java +++ b/src/main/java/com/xydl/cac/controller/ModevController.java @@ -28,59 +28,39 @@ public class ModevController extends BasicController { @GetMapping("listAll") @ApiOperation("查询列表") public Response> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) { - try { - List result = service.listAll(zsbid); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(zsbid); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Modev item) { - try { - Modev result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody Modev item) throws Exception { + Modev result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody Modev item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody Modev item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") - public Response delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) { + service.delete(id); + return Response.success("OK"); } @PostMapping("detail") @ApiOperation("详情") - public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - Modev detail = service.detail(id); - return Response.success(detail); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception { + Modev detail = service.detail(id); + return Response.success(detail); } } diff --git a/src/main/java/com/xydl/cac/controller/ModevTypeController.java b/src/main/java/com/xydl/cac/controller/ModevTypeController.java index b475b1a..8e3226f 100644 --- a/src/main/java/com/xydl/cac/controller/ModevTypeController.java +++ b/src/main/java/com/xydl/cac/controller/ModevTypeController.java @@ -25,59 +25,39 @@ public class ModevTypeController extends BasicController { @GetMapping("listAll") @ApiOperation("查询列表") public Response> listAll() { - try { - List result = service.listAll(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody ModevType item) { - try { - ModevType result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody ModevType item) throws Exception { + ModevType result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody ModevType item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody ModevType item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") - public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { + service.delete(id); + return Response.success("OK"); } @PostMapping("detail") @ApiOperation("详情") - public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - ModevType detail = service.detail(id); - return Response.success(detail); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception { + ModevType detail = service.detail(id); + return Response.success(detail); } } diff --git a/src/main/java/com/xydl/cac/controller/NiecSensorController.java b/src/main/java/com/xydl/cac/controller/NiecSensorController.java index 075be9c..5885212 100644 --- a/src/main/java/com/xydl/cac/controller/NiecSensorController.java +++ b/src/main/java/com/xydl/cac/controller/NiecSensorController.java @@ -40,70 +40,48 @@ public class NiecSensorController extends BasicController { @ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); - try { - Page result = service.list(pageNum, pageSize); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + Page result = service.list(pageNum, pageSize); + return Response.success(result); } @GetMapping("listAll") @ApiOperation("查询全部列表") public Response> listAll() { - try { - List result = service.listAll(); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + List result = service.listAll(); + return Response.success(result); } @GetMapping("getTree") @ApiOperation("查询树") public Response> getTree() { - try { - List result = service.getTree(); - return Response.success(result); - } catch (Exception ex) { - log.error("getTree Exception.", ex); - return Response.fail(ex.getMessage()); - } + List result = service.getTree(); + return Response.success(result); } @GetMapping("detail") @ApiOperation("查询单个装置采集到的数据") - public Response getDetail(@Validated ConditionModel model) { - try { - if (model.getPageNum() != null || model.getPageSize() != null) { - model.setPageNum(this.initPageNum(model.getPageNum())); - model.setPageSize(this.initPageSize(model.getPageSize())); - } - SensorDetail result = service.getDetail(model); - return Response.success(result); - } catch (Exception ex) { - log.error("getDetail Exception.", ex); - return Response.fail(ex.getMessage()); + public Response getDetail(@Validated ConditionModel model) throws Exception { + if (model.getPageNum() != null || model.getPageSize() != null) { + model.setPageNum(this.initPageNum(model.getPageNum())); + model.setPageSize(this.initPageSize(model.getPageSize())); } + SensorDetail result = service.getDetail(model); + return Response.success(result); } @GetMapping("export") @ApiOperation("导出单个装置采集到的数据") - public void export(@Validated ConditionModel model, HttpServletResponse response) { - try { - if (model.getPageNum() != null || model.getPageSize() != null) { - model.setPageNum(this.initPageNum(model.getPageNum())); - model.setPageSize(this.initPageSize(model.getPageSize())); - } - SensorDetail> detail = service.getDetail(model); - response.setHeader("Content-Disposition", "attachment; filename=" - + URLEncoder.encode(detail.getSensor().getName() + ".xlsx", "UTF-8")); - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding("utf-8"); - reportService.exportSensor(detail, response.getOutputStream()); - } catch (Exception ex) { - log.error("exportDetail Exception.", ex); + public void export(@Validated ConditionModel model, HttpServletResponse response) throws Exception { + if (model.getPageNum() != null || model.getPageSize() != null) { + model.setPageNum(this.initPageNum(model.getPageNum())); + model.setPageSize(this.initPageSize(model.getPageSize())); } + SensorDetail> detail = service.getDetail(model); + response.setHeader("Content-Disposition", "attachment; filename=" + + URLEncoder.encode(detail.getSensor().getName() + ".xlsx", "UTF-8")); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + reportService.exportSensor(detail, response.getOutputStream()); } } diff --git a/src/main/java/com/xydl/cac/controller/ZsbController.java b/src/main/java/com/xydl/cac/controller/ZsbController.java index 909ad03..8a23896 100644 --- a/src/main/java/com/xydl/cac/controller/ZsbController.java +++ b/src/main/java/com/xydl/cac/controller/ZsbController.java @@ -24,49 +24,33 @@ public class ZsbController extends BasicController { @GetMapping("listAll") @ApiOperation("查询全部列表") - public Response> listAll(Integer jgid) { - try { - List result = service.listAll(jgid); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response> listAll(Integer jgid) throws Exception { + List result = service.listAll(jgid); + return Response.success(result); } @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Zsb item) { - try { - Zsb result = service.add(item); - return Response.success(result); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response add(@Validated @RequestBody Zsb item) throws Exception { + Zsb result = service.add(item); + return Response.success(result); } @PostMapping("update") @ApiOperation("更新") - public Response update(@Validated @RequestBody Zsb item) { - try { - if (item.getId() == null) { - throw new Exception("ID不能为空!"); - } - service.update(item); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); + public Response update(@Validated @RequestBody Zsb item) throws Exception { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); } + service.update(item); + return Response.success("OK"); } @PostMapping("delete") @ApiOperation("删除") - public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { - try { - service.delete(id); - return Response.success("OK"); - } catch (Exception ex) { - return Response.fail(ex.getMessage()); - } + public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception { + service.delete(id); + return Response.success("OK"); } } diff --git a/src/main/java/com/xydl/cac/exception/GlobalExceptionHandler.java b/src/main/java/com/xydl/cac/exception/GlobalExceptionHandler.java index 436154b..5bd73ed 100644 --- a/src/main/java/com/xydl/cac/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/xydl/cac/exception/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.xydl.cac.exception; import com.xydl.cac.model.Response; +import lombok.extern.slf4j.Slf4j; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import java.util.stream.Collectors; @RestControllerAdvice +@Slf4j public class GlobalExceptionHandler { @ExceptionHandler(MethodArgumentNotValidException.class) @@ -21,6 +23,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(Exception.class) public Response handleException(Exception ex) { + log.error("", ex); String message = ex.getMessage(); return Response.fail(message); } From c2fc6c974b7d067f2b32f9152d810bc3b6e3c023 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 8 Jan 2024 10:42:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?pert:=20=E5=A2=9E=E5=8A=A0lx=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xydl/cac/repository/LxRepository.java | 5 +++++ src/main/java/com/xydl/cac/service/LxService.java | 4 ++-- .../com/xydl/cac/service/impl/LxServiceImpl.java | 13 +++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xydl/cac/repository/LxRepository.java b/src/main/java/com/xydl/cac/repository/LxRepository.java index 3eb2954..9ea33a8 100644 --- a/src/main/java/com/xydl/cac/repository/LxRepository.java +++ b/src/main/java/com/xydl/cac/repository/LxRepository.java @@ -5,8 +5,13 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface LxRepository extends JpaRepository, JpaSpecificationExecutor { + List findByMc(String mc); + + List findByMcAndIdIsNot(String mc, Integer id); } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/LxService.java b/src/main/java/com/xydl/cac/service/LxService.java index 91f1d30..4c3772c 100644 --- a/src/main/java/com/xydl/cac/service/LxService.java +++ b/src/main/java/com/xydl/cac/service/LxService.java @@ -8,9 +8,9 @@ public interface LxService { List listAll(); - Lx add(Lx item); + Lx add(Lx item) throws Exception; - void update(Lx item); + void update(Lx item) throws Exception; void delete(Integer id); } diff --git a/src/main/java/com/xydl/cac/service/impl/LxServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/LxServiceImpl.java index f47dbf9..c355042 100644 --- a/src/main/java/com/xydl/cac/service/impl/LxServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/LxServiceImpl.java @@ -6,6 +6,7 @@ import com.xydl.cac.service.LxService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; @@ -24,13 +25,21 @@ public class LxServiceImpl implements LxService { } @Override - public Lx add(Lx item) { + public Lx add(Lx item) throws Exception { item.setId(null); + List list = repository.findByMc(item.getMc()); + if (!CollectionUtils.isEmpty(list)) { + throw new Exception("该名称已被使用"); + } return repository.save(item); } @Override - public void update(Lx item) { + public void update(Lx item) throws Exception { + List list = repository.findByMcAndIdIsNot(item.getMc(), item.getId()); + if (!CollectionUtils.isEmpty(list)) { + throw new Exception("该名称已被使用"); + } repository.save(item); } From eb55a2cfc6d2c5ce940301798c16365232dafcb3 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 8 Jan 2024 13:58:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4icd=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cac/controller/IcdConfigController.java | 16 +++- .../com/xydl/cac/entity/IcdConfigType.java | 74 +++++++++++++++++ .../com/xydl/cac/entity/IcdConfigTypeAtt.java | 39 +++++++++ .../xydl/cac/entity/IcdConfigTypeInst.java | 31 +++++++ .../IcdConfigTypeAttRepository.java | 17 ++++ .../IcdConfigTypeInstRepository.java | 17 ++++ .../repository/IcdConfigTypeRepository.java | 18 +++++ .../cac/service/IcdFileConfigService.java | 9 ++- .../impl/IcdFileConfigServiceImpl.java | 80 +++++++++++++------ .../java/com/xydl/cac/util/IcdXmlUtil.java | 29 ++++--- 10 files changed, 284 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/xydl/cac/entity/IcdConfigType.java create mode 100644 src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java create mode 100644 src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java create mode 100644 src/main/java/com/xydl/cac/repository/IcdConfigTypeAttRepository.java create mode 100644 src/main/java/com/xydl/cac/repository/IcdConfigTypeInstRepository.java create mode 100644 src/main/java/com/xydl/cac/repository/IcdConfigTypeRepository.java diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index dd54395..d9e2d51 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -1,6 +1,7 @@ package com.xydl.cac.controller; -import com.xydl.cac.entity.IcdFileConfig; +import com.xydl.cac.entity.IcdConfigType; +import com.xydl.cac.entity.IcdConfigTypeAtt; import com.xydl.cac.model.Response; import com.xydl.cac.service.DataService; import com.xydl.cac.service.IcdFileConfigService; @@ -42,8 +43,8 @@ public class IcdConfigController extends BasicController { @GetMapping("list") @ApiOperation("查询全部类型列表") - public Response> list(String iedName) throws Exception { - List result = configService.list(iedName); + public Response> list(String iedName) throws Exception { + List result = configService.list(iedName); return Response.success(result); } @@ -56,11 +57,18 @@ public class IcdConfigController extends BasicController { @PostMapping("update") @ApiOperation("更新ICD类型配置") - public Response update(@RequestBody IcdFileConfig item) { + public Response update(@RequestBody IcdConfigType item) throws Exception { configService.update(item); return Response.success("OK"); } + @PostMapping("updateAtt") + @ApiOperation("更新ICD类型属性配置") + public Response updateAtt(@RequestBody IcdConfigTypeAtt item) throws Exception { + configService.updateAtt(item); + return Response.success("OK"); + } + @PostMapping("delete") @ApiOperation("删除ICD类型配置") public Response delete(@Validated @NotNull(message = "ID不能为空!") Integer id) { diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigType.java b/src/main/java/com/xydl/cac/entity/IcdConfigType.java new file mode 100644 index 0000000..b2bc03c --- /dev/null +++ b/src/main/java/com/xydl/cac/entity/IcdConfigType.java @@ -0,0 +1,74 @@ +package com.xydl.cac.entity; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.LinkedHashMap; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "icd_config_type") +@ApiModel("ICD配置类型表") +public class IcdConfigType { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + @Column(name = "ied_name") + private String iedName; + + @Column(name = "ldevice_inst") + private String ldeviceInst; + + @Column(name = "ln_class") + private String lnClass; + + @Column(name = "table_name") + private String tableName; + + @Transient + private LinkedHashMap attMap; + @Transient + private List attList; + + @Transient + private LinkedHashMap instMap; + @Transient + private List instList; + + public void addAtt(String doName, String lastname) { + if (attMap == null) { + attMap = new LinkedHashMap<>(); + } + if (!attMap.containsKey(doName)) { + IcdConfigTypeAtt item = IcdConfigTypeAtt.builder() + .doName(doName) + .lastName(lastname) + .build(); + attMap.put(doName, item); + } + } + + public void addInst(String inst) { + if (instMap == null) { + instMap = new LinkedHashMap<>(); + } + if (!instMap.containsKey(inst)) { + IcdConfigTypeInst item = IcdConfigTypeInst.builder() + .inst(inst) + .build(); + instMap.put(inst, item); + } + + } +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java new file mode 100644 index 0000000..58fef02 --- /dev/null +++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java @@ -0,0 +1,39 @@ +package com.xydl.cac.entity; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "icd_config_type_att") +@ApiModel("ICD配置类型属性表") +public class IcdConfigTypeAtt { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + @Column(name = "icd_config_type_id") + private Integer icdConfigTypeId; + + @Column(name = "do_name") + private String doName; + + @Column(name = "last_name") + private String lastName; + + @Column(name = "col_name") + private String colName; + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java new file mode 100644 index 0000000..ef036e2 --- /dev/null +++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java @@ -0,0 +1,31 @@ +package com.xydl.cac.entity; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "icd_config_type_inst") +@ApiModel("ICD配置类型实例表") +public class IcdConfigTypeInst { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + @Column(name = "icd_config_type_id") + private Integer icdConfigTypeId; + + @Column(name = "inst") + private String inst; + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdConfigTypeAttRepository.java b/src/main/java/com/xydl/cac/repository/IcdConfigTypeAttRepository.java new file mode 100644 index 0000000..cd3432e --- /dev/null +++ b/src/main/java/com/xydl/cac/repository/IcdConfigTypeAttRepository.java @@ -0,0 +1,17 @@ +package com.xydl.cac.repository; + +import com.xydl.cac.entity.IcdConfigTypeAtt; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface IcdConfigTypeAttRepository extends JpaRepository, JpaSpecificationExecutor { + + List findByIcdConfigTypeId(Integer icdConfigTypeId); + + void deleteByIcdConfigTypeId(Integer icdConfigTypeId); +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdConfigTypeInstRepository.java b/src/main/java/com/xydl/cac/repository/IcdConfigTypeInstRepository.java new file mode 100644 index 0000000..15b459b --- /dev/null +++ b/src/main/java/com/xydl/cac/repository/IcdConfigTypeInstRepository.java @@ -0,0 +1,17 @@ +package com.xydl.cac.repository; + +import com.xydl.cac.entity.IcdConfigTypeInst; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface IcdConfigTypeInstRepository extends JpaRepository, JpaSpecificationExecutor { + + List findByIcdConfigTypeId(Integer icdConfigTypeId); + + void deleteByIcdConfigTypeId(Integer icdConfigTypeId); +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdConfigTypeRepository.java b/src/main/java/com/xydl/cac/repository/IcdConfigTypeRepository.java new file mode 100644 index 0000000..8115ca3 --- /dev/null +++ b/src/main/java/com/xydl/cac/repository/IcdConfigTypeRepository.java @@ -0,0 +1,18 @@ +package com.xydl.cac.repository; + +import com.xydl.cac.entity.IcdConfigType; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface IcdConfigTypeRepository extends JpaRepository, JpaSpecificationExecutor { + + List findByIedName(String iedName); + + List findByIedNameAndLdeviceInstAndLnClass(String iedName, String ldeviceInst, String lnClass); + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java index f5da924..220fd3d 100644 --- a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java +++ b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java @@ -1,6 +1,7 @@ package com.xydl.cac.service; -import com.xydl.cac.entity.IcdFileConfig; +import com.xydl.cac.entity.IcdConfigType; +import com.xydl.cac.entity.IcdConfigTypeAtt; import java.util.List; @@ -10,9 +11,11 @@ public interface IcdFileConfigService { List iedList(); - List list(String iedName) throws Exception; + List list(String iedName) throws Exception; - void update(IcdFileConfig item); + void update(IcdConfigType item) throws Exception; + + void updateAtt(IcdConfigTypeAtt item) throws Exception; void delete(Integer id); } diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index c2bd2dc..362a123 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -1,9 +1,7 @@ package com.xydl.cac.service.impl; -import com.xydl.cac.entity.IcdFileConfig; -import com.xydl.cac.entity.IcdFileConfigInst; -import com.xydl.cac.repository.IcdFileConfigInstRepository; -import com.xydl.cac.repository.IcdFileConfigRepository; +import com.xydl.cac.entity.*; +import com.xydl.cac.repository.*; import com.xydl.cac.service.IcdFileConfigService; import com.xydl.cac.util.IcdXmlUtil; import lombok.extern.slf4j.Slf4j; @@ -17,6 +15,7 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; +import java.util.Optional; @Service @Slf4j @@ -24,60 +23,93 @@ import java.util.List; public class IcdFileConfigServiceImpl implements IcdFileConfigService { @Resource - IcdFileConfigRepository repository; + IcdConfigTypeRepository repository; @Resource - IcdFileConfigInstRepository instRepository; + IcdConfigTypeAttRepository attRepository; + @Resource + IcdConfigTypeInstRepository instRepository; @Resource private JdbcTemplate jdbcTemplate; @Override public void upload(String xml) throws Exception { - LinkedHashMap result = IcdXmlUtil.loadIcdType(xml); - Collection configList = result.values(); - for (IcdFileConfig config : configList) { - List list = repository.findByIedNameAndLdeviceInstAndLnClassAndDoName( - config.getIedName(), config.getLdeviceInst(), config.getLnClass(), config.getDoName()); + LinkedHashMap result = IcdXmlUtil.loadIcdType(xml); + Collection configList = result.values(); + for (IcdConfigType config : configList) { + List list = repository.findByIedNameAndLdeviceInstAndLnClass( + config.getIedName(), config.getLdeviceInst(), config.getLnClass()); if (CollectionUtils.isEmpty(list)) { repository.save(config); - List instList = config.getInstList(); - for (IcdFileConfigInst item : instList) { - item.setConfigId(config.getId()); + + if (config.getAttMap() != null) { + Collection attList = config.getAttMap().values(); + for (IcdConfigTypeAtt item : attList) { + item.setIcdConfigTypeId(config.getId()); + } + attRepository.saveAll(attList); + } + + if (config.getInstMap() != null) { + Collection instList = config.getInstMap().values(); + for (IcdConfigTypeInst item : instList) { + item.setIcdConfigTypeId(config.getId()); + } + instRepository.saveAll(instList); } - instRepository.saveAll(instList); } } } @Override public List iedList() { - String sql = "SELECT DISTINCT ied_name FROM icd_file_config"; + String sql = "SELECT DISTINCT ied_name FROM icd_config_type"; List list = jdbcTemplate.queryForList(sql, String.class); return list; } @Override - public List list(String iedName) throws Exception { - List result; + public List list(String iedName) throws Exception { + List result; if (StringUtils.isNotBlank(iedName)) { result = repository.findByIedName(iedName); } else { result = repository.findAll(); } - for (IcdFileConfig item : result) { - List list = instRepository.findByConfigId(item.getId()); - item.setInstList(list); + for (IcdConfigType item : result) { + List atts = attRepository.findByIcdConfigTypeId(item.getId()); + item.setAttList(atts); + List insts = instRepository.findByIcdConfigTypeId(item.getId()); + item.setInstList(insts); } return result; } @Override - public void update(IcdFileConfig item) { - repository.save(item); + public void update(IcdConfigType item) throws Exception { + Optional optional = repository.findById(item.getId()); + if (!optional.isPresent()) { + throw new Exception("未找到该项"); + } + IcdConfigType r = optional.get(); + r.setTableName(item.getTableName()); + repository.save(r); + } + + @Override + public void updateAtt(IcdConfigTypeAtt item) throws Exception { + Optional optional = attRepository.findById(item.getId()); + if (!optional.isPresent()) { + throw new Exception("未找到该项"); + } + IcdConfigTypeAtt r = optional.get(); + r.setColName(item.getColName()); + attRepository.save(r); } @Override public void delete(Integer id) { - instRepository.deleteByConfigId(id); + instRepository.deleteByIcdConfigTypeId(id); + attRepository.deleteByIcdConfigTypeId(id); repository.deleteById(id); } diff --git a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java index 66746d2..1638db2 100644 --- a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java +++ b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java @@ -4,23 +4,23 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.xydl.cac.entity.IcdFileConfig; +import com.xydl.cac.entity.IcdConfigType; import org.apache.commons.lang3.StringUtils; import java.util.*; public class IcdXmlUtil { - public static LinkedHashMap loadIcdType(String xml) throws Exception { + public static LinkedHashMap loadIcdType(String xml) throws Exception { XmlMapper xmlMapper = XmlMapper.builder() .build(); JsonNode root = xmlMapper.readTree(xml); - LinkedHashMap result = processTypeRoot(root); + LinkedHashMap result = processTypeRoot(root); return result; } - private static LinkedHashMap processTypeRoot(JsonNode root) { - LinkedHashMap result = new LinkedHashMap<>(); + private static LinkedHashMap processTypeRoot(JsonNode root) { + LinkedHashMap result = new LinkedHashMap<>(); List iedList = findNodes(root, "IED"); for (JsonNode iedNode : iedList) { @@ -29,7 +29,7 @@ public class IcdXmlUtil { return result; } - private static void processIEDNode(JsonNode iedNode, LinkedHashMap result) { + private static void processIEDNode(JsonNode iedNode, LinkedHashMap result) { String iedName = iedNode.get("name").asText(); List devList = findNodes(iedNode, "LDevice"); @@ -38,8 +38,8 @@ public class IcdXmlUtil { } } - private static void processTypeDeviceNode(JsonNode deviceNode, String iedName, LinkedHashMap result) { - String ldInst = deviceNode.get("inst").asText(); + private static void processTypeDeviceNode(JsonNode deviceNode, String iedName, LinkedHashMap result) { + String ldeviceInst = deviceNode.get("inst").asText(); Map lnMap = buildLNMap(deviceNode); List fcdaList = findNodes(deviceNode, "FCDA"); @@ -52,21 +52,20 @@ public class IcdXmlUtil { JsonNode lnNode = lnMap.get(lnClass + lnInst); String dai = findLN_DOI_DAI(lnNode, doName); - String key = iedName + ldInst + "/" + lnClass + "/" + doName; + String key = iedName + ldeviceInst + "/" + lnClass; String param = fc + "$" + doName + "$" + dai; if ("MX".equals(fc)) { - IcdFileConfig config = result.get(key); + IcdConfigType config = result.get(key); if (config == null) { - config = IcdFileConfig.builder() + config = IcdConfigType.builder() .iedName(iedName) - .ldeviceInst(ldInst) + .ldeviceInst(ldeviceInst) .lnClass(lnClass) - .doName(doName) - .lastName(dai) .build(); result.put(key, config); } - config.addInst(lnInst, param); + config.addInst(lnInst); + config.addAtt(doName, dai); } } } From 088176196b322662e453983324b99e33379fbd4a Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 8 Jan 2024 14:02:02 +0800 Subject: [PATCH 4/8] =?UTF-8?q?del:=20=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xydl/cac/entity/IcdFileConfig.java | 66 ------------------- .../xydl/cac/entity/IcdFileConfigInst.java | 34 ---------- .../IcdFileConfigInstRepository.java | 18 ----- .../repository/IcdFileConfigRepository.java | 17 ----- 4 files changed, 135 deletions(-) delete mode 100644 src/main/java/com/xydl/cac/entity/IcdFileConfig.java delete mode 100644 src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java delete mode 100644 src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java delete mode 100644 src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java diff --git a/src/main/java/com/xydl/cac/entity/IcdFileConfig.java b/src/main/java/com/xydl/cac/entity/IcdFileConfig.java deleted file mode 100644 index 312a66e..0000000 --- a/src/main/java/com/xydl/cac/entity/IcdFileConfig.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.xydl.cac.entity; - -import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Entity -@Table(name = "icd_file_config") -@ApiModel("ICD文件配置表") -public class IcdFileConfig { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Integer id; - - @Column(name = "ied_name") - private String iedName; - - @Column(name = "ldevice_inst") - private String ldeviceInst; - - @Column(name = "ln_class") - private String lnClass; - - @Column(name = "do_name") - private String doName; - - @Column(name = "last_name") - private String lastName; - - @Column(name = "table_name") - private String tableName; - - @Column(name = "col_name") - private String colName; - - @Transient - private List instList; - - public void addInst(String inst, String paramindex) { - if (instList == null) { - instList = new ArrayList<>(); - } - IcdFileConfigInst item = IcdFileConfigInst.builder() - .inst(inst) - .paramindex(paramindex) - .build(); - instList.add(item); - } - - public String buildParamIndex(IcdFileConfigInst inst) { - String param = iedName + ldeviceInst + "/" + lnClass + inst.getInst() + "$" + inst.getParamindex(); - return param; - } -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java b/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java deleted file mode 100644 index 4faa0f6..0000000 --- a/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.xydl.cac.entity; - -import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Entity -@Table(name = "icd_file_config_inst") -@ApiModel("ICD文件实例表") -public class IcdFileConfigInst { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Integer id; - - @Column(name = "config_id") - private Integer configId; - - @Column(name = "inst") - private String inst; - - @Column(name = "paramindex") - private String paramindex; - -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java b/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java deleted file mode 100644 index 28ff9a6..0000000 --- a/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xydl.cac.repository; - -import com.xydl.cac.entity.IcdFileConfigInst; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import java.util.List; - - -@Repository -public interface IcdFileConfigInstRepository extends JpaRepository, JpaSpecificationExecutor { - - List findByConfigId(Integer configId); - - void deleteByConfigId(Integer configId); - -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java b/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java deleted file mode 100644 index 6563834..0000000 --- a/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.xydl.cac.repository; - -import com.xydl.cac.entity.IcdFileConfig; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import java.util.List; - - -@Repository -public interface IcdFileConfigRepository extends JpaRepository, JpaSpecificationExecutor { - - List findByIedName(String iedName); - - List findByIedNameAndLdeviceInstAndLnClassAndDoName(String iedName, String ldeviceInst, String lnClass, String doName); -} \ No newline at end of file From c8d3c348e121ba085ccc3c7454f4c4f29040415b Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 8 Jan 2024 15:51:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=9C=80=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cac/controller/ParamBindController.java | 11 +++++++ .../xydl/cac/entity/IcdConfigTypeInst.java | 3 ++ .../xydl/cac/service/ParamBindService.java | 3 ++ .../impl/IcdFileConfigServiceImpl.java | 5 +++ .../service/impl/ParamBindServiceImpl.java | 31 ++++++++++++++----- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/xydl/cac/controller/ParamBindController.java b/src/main/java/com/xydl/cac/controller/ParamBindController.java index 1c1501c..a0161cb 100644 --- a/src/main/java/com/xydl/cac/controller/ParamBindController.java +++ b/src/main/java/com/xydl/cac/controller/ParamBindController.java @@ -1,14 +1,18 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.Bdz; +import com.xydl.cac.entity.IcdConfigTypeInst; import com.xydl.cac.model.Response; import com.xydl.cac.service.ParamBindService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.data.repository.query.Param; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.constraints.NotNull; import java.util.List; @RestController @@ -27,4 +31,11 @@ public class ParamBindController extends BasicController { return Response.success(result); } + @GetMapping("instList") + @ApiOperation("查询逻辑设备实例列表") + public Response> instList(@Validated @NotNull(message = "iedName不能为空!") @Param("iedName") String iedName) throws Exception { + List result = bindService.instList(iedName); + return Response.success(result); + } + } diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java index ef036e2..2b983f1 100644 --- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java +++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java @@ -28,4 +28,7 @@ public class IcdConfigTypeInst { @Column(name = "inst") private String inst; + @Transient + private String paramIndex; + } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/ParamBindService.java b/src/main/java/com/xydl/cac/service/ParamBindService.java index 875d258..fea8f02 100644 --- a/src/main/java/com/xydl/cac/service/ParamBindService.java +++ b/src/main/java/com/xydl/cac/service/ParamBindService.java @@ -1,10 +1,13 @@ package com.xydl.cac.service; import com.xydl.cac.entity.Bdz; +import com.xydl.cac.entity.IcdConfigTypeInst; import java.util.List; public interface ParamBindService { List getTree() throws Exception; + + List instList(String iedName); } diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index 362a123..c91a944 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -80,6 +80,11 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { item.setAttList(atts); List insts = instRepository.findByIcdConfigTypeId(item.getId()); item.setInstList(insts); + for (IcdConfigTypeInst inst : insts) { + String param = item.getIedName() + item.getLdeviceInst() + "/" + item.getLnClass() + + inst.getInst(); + inst.setParamIndex(param); + } } return result; } diff --git a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java index 25824fb..ee32568 100644 --- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java @@ -1,13 +1,7 @@ package com.xydl.cac.service.impl; -import com.xydl.cac.entity.Bdz; -import com.xydl.cac.entity.Jg; -import com.xydl.cac.entity.Modev; -import com.xydl.cac.entity.Zsb; -import com.xydl.cac.repository.BdzRepository; -import com.xydl.cac.repository.JgRepository; -import com.xydl.cac.repository.ModevRepository; -import com.xydl.cac.repository.ZsbRepository; +import com.xydl.cac.entity.*; +import com.xydl.cac.repository.*; import com.xydl.cac.service.ParamBindService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Service @@ -30,6 +25,10 @@ public class ParamBindServiceImpl implements ParamBindService { ZsbRepository zsbRepository; @Resource ModevRepository modevRepository; + @Resource + IcdConfigTypeRepository typeRepository; + @Resource + IcdConfigTypeInstRepository typeInstRepository; @Override public List getTree() throws Exception { @@ -51,4 +50,20 @@ public class ParamBindServiceImpl implements ParamBindService { } return bdzList; } + + @Override + public List instList(String iedName) { + List result = new ArrayList<>(); + List typeList = typeRepository.findByIedName(iedName); + for (IcdConfigType type : typeList) { + List instList = typeInstRepository.findByIcdConfigTypeId(type.getId()); + for (IcdConfigTypeInst inst : instList) { + String param = type.getIedName() + type.getLdeviceInst() + "/" + type.getLnClass() + + inst.getInst(); + inst.setParamIndex(param); + } + result.addAll(instList); + } + return result; + } } From a289642053e6b09505f9c7d502c7da12d7c935e0 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 9 Jan 2024 09:08:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E6=8C=87=E5=AE=9Aschema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xydl/cac/service/impl/DataServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java index 0e427a5..63eb638 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -22,6 +22,8 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class DataServiceImpl implements DataService { + private String schema; + @Resource private JdbcTemplate jdbcTemplate; @@ -40,8 +42,12 @@ public class DataServiceImpl implements DataService { @Override public List getDataTableColumns(String tableName) throws Exception { + if (StringUtils.isBlank(schema)) { + this.getDatabase(); + } + List cols = new ArrayList<>(); - String sql = "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME='" + tableName + "'"; + String sql = "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME='" + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; List list = jdbcTemplate.queryForList(sql, String.class); for (String col : list) { if (!col.equals("id") && !col.equals("eqmid") @@ -54,6 +60,12 @@ public class DataServiceImpl implements DataService { return cols; } + private void getDatabase() { + String sql = "select database()"; + List list = jdbcTemplate.queryForList(sql, String.class); + schema = list.get(0); + } + @Override public OnePage> getDate(NiecSensor sensor, List points, ConditionModel model) { OnePage result = new OnePage(); From 6223612495eda3593c522c283e80592028db044b Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 9 Jan 2024 09:35:44 +0800 Subject: [PATCH 7/8] =?UTF-8?q?pert:=20=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2data=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cac/controller/IcdConfigController.java | 5 +++-- .../java/com/xydl/cac/model/ColumnModel.java | 9 +++++++++ .../java/com/xydl/cac/service/DataService.java | 2 +- .../xydl/cac/service/impl/DataServiceImpl.java | 18 +++++++++++------- 4 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/xydl/cac/model/ColumnModel.java diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index d9e2d51..8b7e2da 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -2,6 +2,7 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdConfigTypeAtt; +import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.Response; import com.xydl.cac.service.DataService; import com.xydl.cac.service.IcdFileConfigService; @@ -85,8 +86,8 @@ public class IcdConfigController extends BasicController { @GetMapping("colList") @ApiOperation("查询data表字段名") - public Response> colList(String tableName) throws Exception { - List result = dataService.getDataTableColumns(tableName); + public Response> colList(String tableName) throws Exception { + List result = dataService.getDataTableColumns(tableName); return Response.success(result); } diff --git a/src/main/java/com/xydl/cac/model/ColumnModel.java b/src/main/java/com/xydl/cac/model/ColumnModel.java new file mode 100644 index 0000000..4050593 --- /dev/null +++ b/src/main/java/com/xydl/cac/model/ColumnModel.java @@ -0,0 +1,9 @@ +package com.xydl.cac.model; + +import lombok.Data; + +@Data +public class ColumnModel { + private String name; + private String comment; +} diff --git a/src/main/java/com/xydl/cac/service/DataService.java b/src/main/java/com/xydl/cac/service/DataService.java index 2097387..ed289d4 100644 --- a/src/main/java/com/xydl/cac/service/DataService.java +++ b/src/main/java/com/xydl/cac/service/DataService.java @@ -11,7 +11,7 @@ public interface DataService { List getDataTables() throws Exception; - List getDataTableColumns(String tableName) throws Exception; + List getDataTableColumns(String tableName) throws Exception; OnePage> getDate(NiecSensor sensor, List points, ConditionModel model); } diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java index 63eb638..1749eef 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -2,12 +2,14 @@ package com.xydl.cac.service.impl; import com.xydl.cac.entity.NiecPoint; import com.xydl.cac.entity.NiecSensor; +import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.ConditionModel; import com.xydl.cac.model.OnePage; import com.xydl.cac.service.DataService; import com.xydl.cac.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,23 +43,25 @@ public class DataServiceImpl implements DataService { } @Override - public List getDataTableColumns(String tableName) throws Exception { + public List getDataTableColumns(String tableName) throws Exception { if (StringUtils.isBlank(schema)) { this.getDatabase(); } - List cols = new ArrayList<>(); - String sql = "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME='" + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; - List list = jdbcTemplate.queryForList(sql, String.class); - for (String col : list) { + List result = new ArrayList<>(); + String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment FROM information_schema.columns WHERE TABLE_NAME='" + + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; + List list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ColumnModel.class)); + for (ColumnModel item : list) { + String col = item.getName(); if (!col.equals("id") && !col.equals("eqmid") && !col.equals("acquisitionTime") && !col.equals("d_time") && !col.equals("create_time") && !col.equals("update_time") && !col.equals("isupload")) { - cols.add(col); + result.add(item); } } - return cols; + return result; } private void getDatabase() { From 7ff59faf9426b82ec399747ecae406e2147eb5cb Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 9 Jan 2024 11:04:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cac/controller/ParamBindController.java | 9 +++ .../com/xydl/cac/entity/Rptparamindex.java | 46 ++++++++++++ .../java/com/xydl/cac/model/BindingModel.java | 16 +++++ .../repository/RptparamindexRepository.java | 12 ++++ .../xydl/cac/service/ParamBindService.java | 4 ++ .../service/impl/ParamBindServiceImpl.java | 70 ++++++++++++++++++- .../java/com/xydl/cac/util/IcdXmlUtil.java | 2 +- 7 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/xydl/cac/entity/Rptparamindex.java create mode 100644 src/main/java/com/xydl/cac/model/BindingModel.java create mode 100644 src/main/java/com/xydl/cac/repository/RptparamindexRepository.java diff --git a/src/main/java/com/xydl/cac/controller/ParamBindController.java b/src/main/java/com/xydl/cac/controller/ParamBindController.java index a0161cb..387b098 100644 --- a/src/main/java/com/xydl/cac/controller/ParamBindController.java +++ b/src/main/java/com/xydl/cac/controller/ParamBindController.java @@ -2,6 +2,8 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.Bdz; import com.xydl.cac.entity.IcdConfigTypeInst; +import com.xydl.cac.entity.Rptparamindex; +import com.xydl.cac.model.BindingModel; import com.xydl.cac.model.Response; import com.xydl.cac.service.ParamBindService; import io.swagger.annotations.Api; @@ -38,4 +40,11 @@ public class ParamBindController extends BasicController { return Response.success(result); } + @PostMapping("preview") + @ApiOperation("预览") + public Response> preview(@Validated @RequestBody BindingModel item) throws Exception { + List result = bindService.preview(item); + return Response.success(result); + } + } diff --git a/src/main/java/com/xydl/cac/entity/Rptparamindex.java b/src/main/java/com/xydl/cac/entity/Rptparamindex.java new file mode 100644 index 0000000..e5ca887 --- /dev/null +++ b/src/main/java/com/xydl/cac/entity/Rptparamindex.java @@ -0,0 +1,46 @@ +package com.xydl.cac.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "rptparamindex") +@ApiModel("绑定关系表") +public class Rptparamindex { + + @Id + @ApiModelProperty("61850对象参引") + @Column(name = "paramindex") + private String paramindex; + + @ApiModelProperty("61850对象id") + @Column(name = "objid") + private Integer objid; + + @ApiModelProperty("监测设备id") + @Column(name = "eqmid") + private Integer eqmid; + + @Column(name = "tablename") + private String tablename; + + @Column(name = "colname") + private String colname; + + @Column(name = "phase") + private String phase; + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/model/BindingModel.java b/src/main/java/com/xydl/cac/model/BindingModel.java new file mode 100644 index 0000000..b8b06ae --- /dev/null +++ b/src/main/java/com/xydl/cac/model/BindingModel.java @@ -0,0 +1,16 @@ +package com.xydl.cac.model; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class BindingModel { + @NotNull(message = "eqmid不能为空") + @ApiModelProperty("eqmid") + Integer eqmid; + @NotNull(message = "逻辑设备实例的Id不能为空") + @ApiModelProperty("逻辑设备实例的Id") + Integer bindingId; +} diff --git a/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java b/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java new file mode 100644 index 0000000..48022cc --- /dev/null +++ b/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java @@ -0,0 +1,12 @@ +package com.xydl.cac.repository; + +import com.xydl.cac.entity.Rptparamindex; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + + +@Repository +public interface RptparamindexRepository extends JpaRepository, JpaSpecificationExecutor { + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/ParamBindService.java b/src/main/java/com/xydl/cac/service/ParamBindService.java index fea8f02..f04fa20 100644 --- a/src/main/java/com/xydl/cac/service/ParamBindService.java +++ b/src/main/java/com/xydl/cac/service/ParamBindService.java @@ -2,6 +2,8 @@ package com.xydl.cac.service; import com.xydl.cac.entity.Bdz; import com.xydl.cac.entity.IcdConfigTypeInst; +import com.xydl.cac.entity.Rptparamindex; +import com.xydl.cac.model.BindingModel; import java.util.List; @@ -10,4 +12,6 @@ public interface ParamBindService { List getTree() throws Exception; List instList(String iedName); + + List preview(BindingModel item) throws Exception; } diff --git a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java index ee32568..1b6e3ba 100644 --- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java @@ -1,6 +1,7 @@ package com.xydl.cac.service.impl; import com.xydl.cac.entity.*; +import com.xydl.cac.model.BindingModel; import com.xydl.cac.repository.*; import com.xydl.cac.service.ParamBindService; import lombok.extern.slf4j.Slf4j; @@ -11,6 +12,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @Service @Slf4j @@ -28,7 +30,11 @@ public class ParamBindServiceImpl implements ParamBindService { @Resource IcdConfigTypeRepository typeRepository; @Resource - IcdConfigTypeInstRepository typeInstRepository; + IcdConfigTypeInstRepository instRepository; + @Resource + IcdConfigTypeAttRepository attRepository; + @Resource + RptparamindexRepository rptparamindexRepository; @Override public List getTree() throws Exception { @@ -56,7 +62,7 @@ public class ParamBindServiceImpl implements ParamBindService { List result = new ArrayList<>(); List typeList = typeRepository.findByIedName(iedName); for (IcdConfigType type : typeList) { - List instList = typeInstRepository.findByIcdConfigTypeId(type.getId()); + List instList = instRepository.findByIcdConfigTypeId(type.getId()); for (IcdConfigTypeInst inst : instList) { String param = type.getIedName() + type.getLdeviceInst() + "/" + type.getLnClass() + inst.getInst(); @@ -66,4 +72,64 @@ public class ParamBindServiceImpl implements ParamBindService { } return result; } + + @Override + public List preview(BindingModel item) throws Exception { + Optional optionalInst = instRepository.findById(item.getBindingId()); + if (!optionalInst.isPresent()) { + throw new Exception("未找到该ICD配置类型实例, eqmid=" + item.getEqmid() + ", bindingId=" + item.getBindingId()); + } + IcdConfigTypeInst inst = optionalInst.get(); + Optional optionalType = typeRepository.findById(inst.getIcdConfigTypeId()); + if (!optionalType.isPresent()) { + throw new Exception("未找到该实例对应的ICD配置类型, bindingId=" + item.getBindingId()); + } + IcdConfigType type = optionalType.get(); + + List result = new ArrayList<>(); + String param = type.getIedName() + type.getLdeviceInst() + "/" + type.getLnClass() + + inst.getInst(); + List attList = attRepository.findByIcdConfigTypeId(type.getId()); + for (IcdConfigTypeAtt att : attList) { + String paramindex = param + "$" + att.getLastName(); + Optional optionalRpt = rptparamindexRepository.findById(paramindex); + if (!optionalRpt.isPresent()) { + throw new Exception("未找到该Rptparamindex，对象参引=" + paramindex); + } + Rptparamindex rpt = optionalRpt.get(); + rpt.setTablename(type.getTableName()); + rpt.setColname(att.getColName()); + rpt.setEqmid(item.getEqmid()); + result.add(rpt); + } + return result; + } + + private void bindOne(Integer eqmid, Integer bindingId) throws Exception { + Optional optionalInst = instRepository.findById(bindingId); + if (!optionalInst.isPresent()) { + throw new Exception("未找到该ICD配置类型实例, eqmid=" + eqmid + ", bindingId=" + bindingId); + } + IcdConfigTypeInst inst = optionalInst.get(); + Optional optionalType = typeRepository.findById(inst.getIcdConfigTypeId()); + if (!optionalType.isPresent()) { + throw new Exception("未找到该实例对应的ICD配置类型, bindingId=" + bindingId); + } + IcdConfigType type = optionalType.get(); + String param = type.getIedName() + type.getLdeviceInst() + "/" + type.getLnClass() + + inst.getInst(); + List attList = attRepository.findByIcdConfigTypeId(type.getId()); + for (IcdConfigTypeAtt att : attList) { + String paramindex = param + "$" + att.getLastName(); + Optional optionalRpt = rptparamindexRepository.findById(paramindex); + if (!optionalRpt.isPresent()) { + throw new Exception("未找到该Rptparamindex，对象参引=" + paramindex); + } + Rptparamindex rpt = optionalRpt.get(); + rpt.setTablename(type.getTableName()); + rpt.setColname(att.getColName()); + rpt.setEqmid(eqmid); + rptparamindexRepository.save(rpt); + } + } } diff --git a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java index 1638db2..7487eb5 100644 --- a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java +++ b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java @@ -65,7 +65,7 @@ public class IcdXmlUtil { result.put(key, config); } config.addInst(lnInst); - config.addAtt(doName, dai); + config.addAtt(doName, param); } } }