From 75a0054185acb56b542d17627f8e4306bdef918e Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 15:42:07 +0800 Subject: [PATCH 01/36] append --- .../impl/PowerAxisStructServiceImpl.java | 55 +++++++++---------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index ce016b5..d726a30 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -129,19 +129,38 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + if (baseDao.queryCategory(struct) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点"); } } - if (baseDao.queryName(form) > NumConstant.ZERO) { + if (baseDao.queryName(struct) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); } - - this.assembleStruct(form, loginUserUtil.getLoginUserCustomerId()); - - baseDao.insert(form); } /** @@ -198,28 +217,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点"); - } - } - if (baseDao.queryName(form) > NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); - } - - this.assembleStruct(form, loginUserUtil.getLoginUserCustomerId()); - - baseDao.updateById(form); - } - -// private void - @Override public void delete(String id) { baseDao.delete(id); From 168d9ed91b0c0d9ba3a9e444a2aad5285e45097a Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 16:48:43 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/plugin/power/enums/PowerTagCategoryEnum.java | 4 ++++ .../modules/axis/service/impl/PowerAxisTagServiceImpl.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/enums/PowerTagCategoryEnum.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/enums/PowerTagCategoryEnum.java index 7e42bd6..b29d263 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/enums/PowerTagCategoryEnum.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/enums/PowerTagCategoryEnum.java @@ -12,6 +12,10 @@ public enum PowerTagCategoryEnum { * 动力主轴负责人 */ LEADER("leader"), + /** + * 默认参数 + */ + PARAM("param"), /** * 动力主轴节点 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index 697415d..73fbc01 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -78,6 +78,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl Date: Fri, 22 Apr 2022 16:56:53 +0800 Subject: [PATCH 03/36] append --- .../axis/service/impl/PowerAxisTagServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index 73fbc01..1a67623 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -36,9 +36,6 @@ import java.util.Map; @Service public class PowerAxisTagServiceImpl extends BaseServiceImpl implements PowerAxisTagService { -// @Autowired -// private PowerAxisTagRedis powerAxisTagRedis; - @Autowired private LoginUserUtil loginUserUtil; @@ -46,7 +43,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), + getPage(params, FieldConstant.CREATED_TIME, true), getWrapper(params) ); return getPageData(page, PowerAxisTagDTO.class); @@ -63,7 +60,8 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .orderByAsc("STRUCT_LEVEL"); return wrapper; } From df74b9a612e1c0d196f9bf1b1e7a27c0e9c09ac6 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 17:26:02 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power/modules/axis/controller/PowerAxisTagController.java | 2 +- .../plugin/power/modules/axis/entity/PowerAxisTagEntity.java | 1 - .../modules/axis/service/impl/PowerAxisTagServiceImpl.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java index c8661b6..7cc8a9d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java @@ -65,7 +65,7 @@ public class PowerAxisTagController { return new Result(); } - @PostMapping("delete") + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java index 2a9083a..6dd47d7 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java @@ -6,7 +6,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; /** * 动力主轴标签 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index 1a67623..f7bd21e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -61,7 +61,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .orderByAsc("STRUCT_LEVEL"); + .orderByAsc("TAG_CATEGORY", "STRUCT_LEVEL"); return wrapper; } From 6816275c12b82c22b30e8485fdc729fb95376881 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 17:31:14 +0800 Subject: [PATCH 05/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/template/Controller.java.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm index 5caa046..81b4ab9 100644 --- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm @@ -39,7 +39,7 @@ public class ${className}Controller { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) public Result<${className}DTO> get(@PathVariable("id") String id){ ${className}DTO data = ${classname}Service.get(id); return new Result<${className}DTO>().ok(data); @@ -63,7 +63,7 @@ public class ${className}Controller { return new Result(); } - @PostMapping("delete") + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); From a0a09417a7d61ef04cb67feafca48d8bdc90eaa8 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 17:32:29 +0800 Subject: [PATCH 06/36] =?UTF-8?q?dto=E6=96=B0=E5=A2=9E=E4=B8=9A=E4=B8=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/power/dto/axis/PowerKernelHouseholdDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java index 3e70505..4df180c 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java @@ -42,6 +42,16 @@ public class PowerKernelHouseholdDTO implements Serializable { */ private String ownerName; + /** + * 户主ID + */ + private String ownerIdCard; + + /** + * 户主电话 + */ + private String ownerPhone; + /** * 房屋ID */ From 93c566b04cfcb0d988e59607c6df896d61fe3c53 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 22 Apr 2022 17:44:09 +0800 Subject: [PATCH 07/36] =?UTF-8?q?message:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...owerAxiskernelHouseholdViewController.java | 2 +- .../PowerKernelHouseholdController.java | 13 +++++++-- .../axis/dao/PowerKernelHouseholdDao.java | 2 +- .../axis/entity/PowerAxisLeaderEntity.java | 1 + .../service/PowerKernelHouseholdService.java | 2 +- .../impl/PowerKernelHouseholdServiceImpl.java | 8 +++--- .../mapper/poweraxis/PowerAxisLeaderDao.xml | 10 ++++--- .../poweraxis/PowerKernelHouseholdDao.xml | 27 ++++++++++--------- 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java index 5c9caf7..7c48708 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java @@ -29,7 +29,7 @@ public class PowerAxiskernelHouseholdViewController { */ @PostMapping("/list") public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ - PowerKernelHouseHoldViewListResultDTO dto = powerKernelHouseholdService.getList(form); + List dto = powerKernelHouseholdService.getList(form); return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); } /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java index 8ae80ea..1fc4ade 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java @@ -21,6 +21,7 @@ import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -115,14 +116,22 @@ public class PowerKernelHouseholdController { IcHouseDTO houseDto = icHouseDTOResult.getData(); entity = new PowerKernelHouseholdEntity(); entity.setHouseId(houseInfo.getHomeId()); - entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); - entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); + + if(!StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !StringUtils.isEmpty(houseInfo.getBuildingLongitude())){ + entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); + entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); + } else { + entity.setLatitude(BigDecimal.ZERO); + entity.setLongitude(BigDecimal.ZERO); + } entity.setAddress(houseInfo.getAllName()); entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); entity.setOwnerPhone(houseDto.getOwnerPhone()); entity.setOwnerIdCard(houseDto.getOwnerIdCard()); entity.setOwnerName(houseDto.getOwnerName()); + + entity.setStructReferenceId(form.getAxisStructId()); powerKernelHouseholdService.insert(entity); } return new Result(); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java index 2a50189..4444184 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java @@ -23,7 +23,7 @@ import java.util.List; public interface PowerKernelHouseholdDao extends BaseDao { - PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form); + List getList(PowerKernelHouseHoldViewListFormDTO form); long getTotal(PowerKernelHouseHoldViewListFormDTO form); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java index 50f9293..0a2ae0f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java @@ -51,4 +51,5 @@ public class PowerAxisLeaderEntity extends BaseEpmetEntity { */ private String avatar; + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java index 7109d9e..04b363e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java @@ -86,7 +86,7 @@ public interface PowerKernelHouseholdService extends BaseService getList(PowerKernelHouseHoldViewListFormDTO form); long getTotal(PowerKernelHouseHoldViewListFormDTO form); /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index 1f2834c..c65b9bb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -56,9 +56,11 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String axisStructId = (String)params.get("axisStructId"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId); return wrapper; } @@ -94,9 +96,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getList(PowerKernelHouseHoldViewListFormDTO form) { form.setPageNo((form.getPageNo() - 1) * form.getPageSize()); - PowerKernelHouseHoldViewListResultDTO dto = baseDao.getList(form); + List dto = baseDao.getList(form); return dto; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml index c6953b0..a43d55d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml @@ -38,18 +38,22 @@ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index 98f20a4..81620ed 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -20,19 +20,7 @@ - + + \ No newline at end of file From 6daf8a2098d1b4b859e0ace84e5e07fc98c0b3d0 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 18:41:33 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PowerKernelHouseholdServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index c65b9bb..8308186 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -54,13 +54,15 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String axisStructId = (String)params.get("axisStructId"); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String axisStructId = (String) params.get("axisStructId"); + String ownerName = (String) params.get("ownerName"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId); + .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId) + .like(StringUtils.isNotBlank(ownerName), "OWNER_NAME", ownerName); return wrapper; } From b223f8cee5d7b3dcddf615c05885c2b997f05b92 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 19:11:05 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/axis/dao/PowerAxisStructDao.java | 2 +- .../impl/PowerAxisStructServiceImpl.java | 5 ++--- .../mapper/poweraxis/PowerAxisStructDao.xml | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index b16b37e..85abb87 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -60,7 +60,7 @@ public interface PowerAxisStructDao extends BaseDao { List getPartyCommList(); - int queryName(PowerAxisStructEntity form); + int countByRepeatStruct(PowerAxisStructEntity form); int queryCategory(PowerAxisStructEntity form); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index d726a30..b44f13b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -9,7 +9,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -151,14 +150,14 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点"); } } - if (baseDao.queryName(struct) > NumConstant.ZERO) { + if (baseDao.countByRepeatStruct(struct) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index f2122c2..86cce05 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -129,15 +129,22 @@ AND del_flag = 0 - SELECT count(*) FROM - pli_power_axis_struct + pli_power_axis_struct s WHERE - NAME = #{name} - AND - agency_id = #{agencyId} + s.CUSTOMER_ID = #{customerId} + AND s.`NAME` = #{name} + + AND s.AGENCY_ID = #{agencyId} + + + AND s.AGENCY_ID = (SELECT t.agency_id FROM pli_power_axis_struct t WHERE t.ID = '1517392376018866178') + + + + SELECT + id AS stationId, + longitude, + latitude, + address + FROM + pli_power_service_station + WHERE + STRUCT_REFERENCE_ID = #{axisStructId} + and + CUSTOMER_ID = #{customerId} + limit #{limit} + + \ No newline at end of file From 7bfaacaa93d9723aa390aa78acaa9932c04090c6 Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 22 Apr 2022 19:56:41 +0800 Subject: [PATCH 11/36] update --- .../controller/PowerAxisTagController.java | 6 ++- .../modules/axis/dao/PowerAxisStructDao.java | 4 +- .../axis/service/PowerAxisTagService.java | 2 +- .../impl/PowerAxisStructServiceImpl.java | 44 +++++++++++++++++-- .../service/impl/PowerAxisTagServiceImpl.java | 4 +- .../impl/PowerServiceStationServiceImpl.java | 10 +++-- .../mapper/poweraxis/PowerAxisStructDao.xml | 6 +-- 7 files changed, 59 insertions(+), 17 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java index 7cc8a9d..38379a3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java @@ -1,7 +1,9 @@ package com.epmet.plugin.power.modules.axis.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -88,8 +90,8 @@ public class PowerAxisTagController { * @date 2022/4/18/0018 18:12 */ @PostMapping("listSimple/{tagCategory}") - public Result> listSimple(@PathVariable("tagCategory") String tagCategory) { - return new Result().ok(powerAxisTagService.listSimple(tagCategory)); + public Result> listSimple(@PathVariable("tagCategory") String tagCategory, @LoginUser TokenDto tokenDto) { + return new Result().ok(powerAxisTagService.listSimple(tagCategory, tokenDto.getCustomerId())); } /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 85abb87..7660104 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -60,9 +60,9 @@ public interface PowerAxisStructDao extends BaseDao { List getPartyCommList(); - int countByRepeatStruct(PowerAxisStructEntity form); + int countRepeatStructByName(PowerAxisStructEntity form); - int queryCategory(PowerAxisStructEntity form); + int countRepeatStructByCategory(PowerAxisStructEntity form); List getIdsByAgencyId(String agencyId); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java index 3fd1d7a..994b2b1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java @@ -87,7 +87,7 @@ public interface PowerAxisTagService extends BaseService { * @author work@yujt.net.cn * @date 2022/4/18/0018 17:24 */ - List listSimple(String tagCategory); + List listSimple(String tagCategory, String customerId); /** * 查询所有标签 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index b44f13b..2739fde 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -1,8 +1,10 @@ package com.epmet.plugin.power.modules.axis.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.enums.EpmetDelFlagEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -23,6 +25,7 @@ import com.epmet.plugin.power.enums.PowerTagCategoryEnum; import com.epmet.plugin.power.enums.PowerTagLevelEnum; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity; +import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService; import org.apache.commons.lang3.StringUtils; @@ -153,11 +156,11 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + if (baseDao.countRepeatStructByCategory(struct) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点"); } } - if (baseDao.countByRepeatStruct(struct) > NumConstant.ZERO) { + if (baseDao.countRepeatStructByName(struct) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); } } @@ -265,6 +268,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl tagList = powerAxisTagService.listSimple(PowerTagCategoryEnum.PARAM.category(), loginUserUtil.getLoginUserCustomerId()); + tagList.forEach( + item -> { + int numTemp; + switch (item.getCategoryCode()) { + case "volunteerTeamNum": + numTemp = Integer.parseInt(item.getCategoryName()); + if (numTemp > NumConstant.ZERO) { + result.setVolunteerTeamNum(numTemp); + } + break; + case "partyMemberNum": + numTemp = Integer.parseInt(item.getCategoryName()); + if (numTemp > NumConstant.ZERO) { + result.setPartyMemberNum(numTemp); + } + break; + case "kernelHouseHoldNum": + numTemp = Integer.parseInt(item.getCategoryName()); + if (numTemp > NumConstant.ZERO) { + result.setKernelHouseHoldNum(numTemp); + } + break; + default: + break; + } + } + ); + return result; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index f7bd21e..52e0c29 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -96,7 +96,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl listSimple(String tagCategory) { + public List listSimple(String tagCategory, String customerId) { if (StringUtils.isBlank(tagCategory)) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "缺少参数"); @@ -105,7 +105,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("TAG_CATEGORY", tagCategory) .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value()) - .eq(FieldConstant.CUSTOMER_ID, loginUserUtil.getLoginUserCustomerId()) + .eq(FieldConstant.CUSTOMER_ID, customerId) .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME); return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java index f8d9de1..5143eef 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java @@ -49,11 +49,15 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get("name"); + String axisStructId = (String) params.get("axisStructId"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .eq(StringUtils.isNotBlank(name), "NAME", name) + .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", name); return wrapper; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index 86cce05..f70bb55 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -129,7 +129,7 @@ AND del_flag = 0 - SELECT count(*) FROM @@ -146,13 +146,13 @@ - SELECT count(*) FROM pli_power_axis_struct WHERE - AGENCY_ID = #{agencyId} + AGENCY_ID = #{agencyId} and CUSTOMER_ID = #{customerId} and CATEGORY_CODE = #{categoryCode} SELECT @@ -155,7 +160,7 @@ AGENCY_ID = #{agencyId} and CUSTOMER_ID = #{customerId} and CATEGORY_CODE = #{categoryCode} + + + diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml index 44c7a36..648c89e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml @@ -31,6 +31,7 @@ LEFT JOIN pli_power_axis_struct_leader sl ON sl.LEADER_ID = l.ID WHERE sl.STRUCT_REFERENCE_ID = #{axisStructId} AND sl.DEL_FLAG = '0' AND l.DEL_FLAG = '0' + and l.customer_id = #{customerId} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index 81620ed..d988167 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -28,6 +28,8 @@ pli_power_kernel_household WHERE STRUCT_REFERENCE_ID = #{axisStructId} + AND + customer_id = #{customerrId} From b9a5ed7c3344a328a9f81e772dde343f44d947c5 Mon Sep 17 00:00:00 2001 From: HAHA Date: Sat, 23 Apr 2022 10:21:05 +0800 Subject: [PATCH 13/36] =?UTF-8?q?message:=20=E8=A1=A5=E5=85=85=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PowerAxisStructViewController.java | 21 ++++++++++++++++++- ...owerAxiskernelHouseholdViewController.java | 9 ++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java index 4874aed..f398dbd 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java @@ -26,6 +26,10 @@ public class PowerAxisStructViewController { /** * 关键指标统计 + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 */ @PostMapping("/statistics") public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form){ @@ -35,6 +39,10 @@ public class PowerAxisStructViewController { /** * 动力主轴负责人详细信息 + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 */ @PostMapping("/leader") public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form){ @@ -43,7 +51,11 @@ public class PowerAxisStructViewController { } /** - *动力主轴结构树 + * 动力主轴结构树 + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 */ @PostMapping("/structTree") public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form){ @@ -51,6 +63,13 @@ public class PowerAxisStructViewController { return new Result().ok(dto); } + /** + * 动力主轴节点坐标集合 + * @param structLevel + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:19 + */ @PostMapping("/{structLevel}/listPosition") public ResultDTO getListPosition(@PathVariable int structLevel){ List list = powerAxisStructService.getListPosition(structLevel); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java index 7c48708..186d03f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java @@ -26,14 +26,23 @@ public class PowerAxiskernelHouseholdViewController { /** * 党员中心户列表 + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 */ @PostMapping("/list") public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ List dto = powerKernelHouseholdService.getList(form); return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); } + /** * 党员中心户坐标集合 + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 */ @PostMapping("/listPosition") public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form){ From eae74e1ce252e9ff48207d2c2aea36756858b157 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 10:32:46 +0800 Subject: [PATCH 14/36] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E6=94=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PowerAxisStructViewController.java | 78 ---------- ...owerAxiskernelHouseholdViewController.java | 52 ------- .../PowerViewServiceStationController.java | 37 ----- .../PowerAxisDataVisualController.java | 136 ++++++++++++++++++ 4 files changed, 136 insertions(+), 167 deletions(-) delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java deleted file mode 100644 index f398dbd..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; - -import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisStructViewFormDTO; -import com.epmet.plugin.power.dto.axis.result.*; -import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; -import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/data/axis") -public class PowerAxisStructViewController { - - @Autowired - private PowerAxisStructService powerAxisStructService; - - @Autowired - private PowerAxisLeaderService powerAxisLeaderService; - - /** - * 关键指标统计 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/statistics") - public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form){ - PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); - return new Result().ok(result); - } - - /** - * 动力主轴负责人详细信息 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/leader") - public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form){ - PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form); - return new Result().ok(dto); - } - - /** - * 动力主轴结构树 - * @param form - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/structTree") - public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form){ - List dto = powerAxisStructService.getStructTree(form); - return new Result().ok(dto); - } - - /** - * 动力主轴节点坐标集合 - * @param structLevel - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:19 - */ - @PostMapping("/{structLevel}/listPosition") - public ResultDTO getListPosition(@PathVariable int structLevel){ - List list = powerAxisStructService.getListPosition(structLevel); - return ResultDTO.success("成功",list,powerAxisStructService.queryTotal(structLevel)); - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java deleted file mode 100644 index 186d03f..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; -import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; -import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; -import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; -import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - - -@RestController -@RequestMapping("/data/kernelHousehold") -public class PowerAxiskernelHouseholdViewController { - - @Autowired - private PowerKernelHouseholdService powerKernelHouseholdService; - - - /** - * 党员中心户列表 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/list") - public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ - List dto = powerKernelHouseholdService.getList(form); - return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); - } - - /** - * 党员中心户坐标集合 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/23 10:20 - */ - @PostMapping("/listPosition") - public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form){ - List dto = powerKernelHouseholdService.getListPosition(form); - return ResultDTO.success("成功",dto,powerKernelHouseholdService.getListTotal(form)); - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java deleted file mode 100644 index 308d597..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.epmet.plugin.power.modules.axis.ViewController; - -import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.GBaseDialect; -import com.epmet.plugin.power.dto.axis.ResultDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; -import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; -import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.xml.transform.Result; -import java.util.List; - -@RestController -@RequestMapping("/data/serviceStation") -public class PowerViewServiceStationController { - - @Autowired - private PowerServiceStationService powerServiceStationService; - - /** - * 党群服务站集合坐标 - * @param form - * @return com.epmet.plugin.power.dto.axis.ResultDTO - * @author LZN - * @date 2022/4/22 19:53 - */ - @PostMapping("/listPosition") - public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form){ - List list = powerServiceStationService.getListPosition(form); - return ResultDTO.success("成功",list,powerServiceStationService.queryTotal(form)); - } - -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java new file mode 100644 index 0000000..b98a9c2 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java @@ -0,0 +1,136 @@ +package com.epmet.plugin.power.modules.axis.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.axis.ResultDTO; +import com.epmet.plugin.power.dto.axis.form.*; +import com.epmet.plugin.power.dto.axis.result.*; +import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; +import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; +import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; +import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/*** + * 动力主轴相关数据可视化接口 + * @author work@yujt.net.cn + * @date 2022/4/23/0023 10:27 + */ +@RestController +@RequestMapping("data") +public class PowerAxisDataVisualController { + + @Autowired + private PowerAxisStructService powerAxisStructService; + + @Autowired + private PowerAxisLeaderService powerAxisLeaderService; + + @Autowired + private PowerServiceStationService powerServiceStationService; + + @Autowired + private PowerKernelHouseholdService powerKernelHouseholdService; + + /** + * 党群服务站集合坐标 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/22 19:53 + */ + @PostMapping("serviceStation/listPosition") + public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form) { + List list = powerServiceStationService.getListPosition(form); + return ResultDTO.success("成功", list, powerServiceStationService.queryTotal(form)); + } + + /** + * 关键指标统计 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/statistics") + public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form) { + PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); + return new Result().ok(result); + } + + /** + * 动力主轴负责人详细信息 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/leader") + public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form) { + PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form); + return new Result().ok(dto); + } + + /** + * 动力主轴结构树 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("axis/structTree") + public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form) { + List dto = powerAxisStructService.getStructTree(form); + return new Result().ok(dto); + } + + /** + * 动力主轴节点坐标集合 + * + * @param structLevel + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:19 + */ + @PostMapping("axis/{structLevel}/listPosition") + public ResultDTO getListPosition(@PathVariable int structLevel) { + List list = powerAxisStructService.getListPosition(structLevel); + return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel)); + } + + + /** + * 党员中心户列表 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("kernelHousehold/list") + public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form) { + List dto = powerKernelHouseholdService.getList(form); + return ResultDTO.success("查询成功", dto, powerKernelHouseholdService.getTotal(form)); + } + + /** + * 党员中心户坐标集合 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.ResultDTO + * @author LZN + * @date 2022/4/23 10:20 + */ + @PostMapping("kernelHousehold/listPosition") + public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form) { + List dto = powerKernelHouseholdService.getListPosition(form); + return ResultDTO.success("成功", dto, powerKernelHouseholdService.getListTotal(form)); + } + +} From 1f4dea29df194d6ffcd20a37864f71a60292cf64 Mon Sep 17 00:00:00 2001 From: HAHA Date: Sat, 23 Apr 2022 10:35:35 +0800 Subject: [PATCH 15/36] =?UTF-8?q?message:=20=E5=BA=9F=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axis/controller/PowerAxisStructController.java | 9 +-------- .../power/modules/axis/dao/PowerAxisStructDao.java | 5 +---- .../modules/axis/service/PowerAxisStructService.java | 5 +---- .../axis/service/impl/PowerAxisStructServiceImpl.java | 6 +----- .../resources/mapper/poweraxis/PowerAxisStructDao.xml | 8 +------- 5 files changed, 5 insertions(+), 28 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java index 071c933..5d87134 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java @@ -107,14 +107,7 @@ public class PowerAxisStructController { return new Result>().ok(result); } - /** - * 获取树状列表 - */ - @PostMapping("/getTreeList") - public Result queryList(){ - List list = powerAxisStructService.queryList(); - return new Result>().ok(list); - } + /** * 添加组织 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 49415ee..7400a01 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -36,10 +36,7 @@ public interface PowerAxisStructDao extends BaseDao { */ List queryDeptByName(PowerAxisStructFormDTO form); - /** - * 获取树状列表 - */ - List queryList(); + void delete(String id); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 2225736..ec6a992 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -84,10 +84,7 @@ public interface PowerAxisStructService extends BaseService queryDeptByName(PowerAxisStructFormDTO form); - /** - * 获取树状列表 - */ - List queryList(); + /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 752931b..94a1627 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -119,11 +119,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl queryList() { - List list = powerAxisStructDao.queryList(); - return list; - } + @Override diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index 67b0380..103c53d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -87,13 +87,7 @@ and customer_id = #{customerId} - + + \ No newline at end of file From fed8399676161d9c64fa651ade1fcbca6b86bff8 Mon Sep 17 00:00:00 2001 From: HAHA Date: Sat, 23 Apr 2022 11:31:44 +0800 Subject: [PATCH 22/36] =?UTF-8?q?message:=20=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 0141bd9..36b4bc7 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -147,7 +147,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + if (baseDao.countRepeatStructByCategory(customerId, agencyId, categoryCode, structDto.getId()) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点"); } } From f68add317b3b6937f0744a823cddfcd11a40c2e8 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 11:35:23 +0800 Subject: [PATCH 23/36] append --- .../plugin/power/modules/axis/dao/PowerAxisStructDao.java | 3 ++- .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 2 +- .../src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index c994d34..ebd446c 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -69,7 +69,8 @@ public interface PowerAxisStructDao extends BaseDao { int countRepeatStructByName(@Param("customerId") String customerId, @Param("name") String name, @Param("agencyId") String agencyId, - @Param("pid") String pid); + @Param("pid") String pid, + @Param("id") String id); /** * 查询同组织下是否有同级的节点 （主要用于一级节点判重） diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 36b4bc7..7d51194 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -151,7 +151,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + if (baseDao.countRepeatStructByName(customerId, structDto.getName(), agencyId, structDto.getPid(), structDto.getId()) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index f853869..247a68a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -144,6 +144,7 @@ + AND s.ID != #{id} - SELECT - count(*) + HOUSE_ID FROM - pli_power_kernel_household - WHERE - STRUCT_REFERENCE_ID = #{structReferenceId} - AND - HOUSE_ID = #{houseId} + pli_power_kernel_household + + house_id in + + #{houseId} + + AND + STRUCT_REFERENCE_ID = #{axisStructId} + AND + customer_id = #{customerId} + AND + del_flag = '0' + From 0390b3c73e1d2c04d578561af6292027fbabd279 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 14:48:09 +0800 Subject: [PATCH 25/36] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PowerAxisStructTreeResultDTO.java | 7 +++- .../controller/PowerAxisStructController.java | 24 +++++------ .../modules/axis/dao/PowerAxisStructDao.java | 18 +++++---- .../axis/service/PowerAxisStructService.java | 23 +++++------ .../impl/PowerAxisStructServiceImpl.java | 22 ++-------- .../mapper/poweraxis/PowerAxisStructDao.xml | 40 +++++++------------ 6 files changed, 56 insertions(+), 78 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructTreeResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructTreeResultDTO.java index 5ca4d17..b966866 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructTreeResultDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructTreeResultDTO.java @@ -3,8 +3,13 @@ package com.epmet.plugin.power.dto.axis.result; import com.epmet.commons.tools.utils.TreeNode; import lombok.Data; +import java.io.Serializable; + @Data -public class PowerAxisStructTreeResultDTO extends TreeNode { +public class PowerAxisStructTreeResultDTO extends TreeNode implements Serializable { + + private static final long serialVersionUID = 5859286638629746692L; + private Long id; private Long pid; private String name; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java index 599aa52..2195d89 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java @@ -16,7 +16,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO; -import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO; import com.epmet.plugin.power.dto.axis.result.*; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity; @@ -139,12 +138,17 @@ public class PowerAxisStructController { } /** - * 查询父id + * 根据节点接报，组装其上级节点树 + * + * @param structLevel 节点级别 + * @param tokenDto 登录用户 + * @return com.epmet.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2022/4/23/0023 14:44 */ - @PostMapping("/getPid") - public Result> getPid() { - List pid = powerAxisStructService.getPid(); - return new Result>().ok(pid); + @PostMapping("bylevel/{structLevel}/parenttree") + public Result listParentTreeByLevel(@PathVariable String structLevel, @LoginUser TokenDto tokenDto) { + return new Result().ok(powerAxisStructService.listParentTreeByLevel(structLevel, tokenDto.getCustomerId())); } /** @@ -156,13 +160,5 @@ public class PowerAxisStructController { return new Result().ok(power); } - /** - * 按节点类型获取节点列表 - */ - @PostMapping("/listByCategoryCode") - public Result getListByCategoryCode(@RequestBody PowerAxisStructListByCategoryCodeFormDTO form) { - List dto = powerAxisStructService.getListByCategoryCode(form); - return new Result().ok(dto); - } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index ebd446c..691fef9 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -45,11 +45,6 @@ public interface PowerAxisStructDao extends BaseDao { */ List getGridPartyBranchList(String customerId); - /** - * 获取pid - */ - List getPid(String customerId); - /** * 获取上级党委 */ @@ -90,8 +85,6 @@ public interface PowerAxisStructDao extends BaseDao { List getIdsByAgencyId(String agencyId, String customerId); - List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form); - int queryGridParty(PowerAxisStructViewFormDTO form); int queryGroupParty(PowerAxisStructViewFormDTO form); @@ -108,4 +101,15 @@ public interface PowerAxisStructDao extends BaseDao { long queryTotal(String customerId, String code); + + /** + * 根据节点接报，组装其上级节点树 + * + * @param structLevel 节点级别 + * @param customerId 客户ID + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/23/0023 14:38 + */ + List listParentTreeByLevel(@Param("structLevel") int structLevel, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 7f78329..59ac9fd 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -106,13 +106,6 @@ public interface PowerAxisStructService extends BaseService getGridPartyBranchList(); - /** - * 查询父id - * - * @return String - */ - List getPid(); - /** * 获取上级党委列表 */ @@ -129,11 +122,6 @@ public interface PowerAxisStructService extends BaseService getIdByAgencyId(String agencyId); - /** - * 按节点类型获取节点列表 - */ - List getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form); - /** * 关键指标统计 */ @@ -147,4 +135,15 @@ public interface PowerAxisStructService extends BaseService getListPosition(int structLevel); long queryTotal(int structLevel); + + /** + * 根据节点接报，组装其上级节点树 + * + * @param structLevel 节点级别 + * @param customerId 客户ID + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/23/0023 14:37 + */ + List listParentTreeByLevel(String structLevel, String customerId); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 7d51194..329905e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -222,13 +222,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getPid() { - String customerId = loginUserUtil.getLoginUserCustomerId(); - List pid = baseDao.getPid(customerId); - return pid; - } - @Override public List getPartyCommList() { String customerId = loginUserUtil.getLoginUserCustomerId(); @@ -249,16 +242,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form) { - form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - List dto = baseDao.getListByCategoryCode(form); - return dto; - } - @Override public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) { form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); @@ -347,5 +330,8 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl listParentTreeByLevel(String structLevel, String customerId) { + return baseDao.listParentTreeByLevel(Integer.parseInt(structLevel), customerId); + } } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index 247a68a..d5f8021 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -102,18 +102,6 @@ AND customer_id = #{customerId} - select id from pli_power_axis_struct where agency_id = #{agencyId} and customer_id = #{customerId} - + \ No newline at end of file From 06d2e498381e9453f829455db27678aa70fa06c8 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 14:50:05 +0800 Subject: [PATCH 26/36] append --- .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 329905e..2e7cc28 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -25,7 +25,6 @@ import com.epmet.plugin.power.enums.PowerTagCategoryEnum; import com.epmet.plugin.power.enums.PowerTagLevelEnum; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity; -import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity; import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService; import org.apache.commons.lang3.StringUtils; @@ -332,6 +331,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl listParentTreeByLevel(String structLevel, String customerId) { - return baseDao.listParentTreeByLevel(Integer.parseInt(structLevel), customerId); + List result = baseDao.listParentTreeByLevel(Integer.parseInt(structLevel), customerId); + return TreeUtils.build(result); } } \ No newline at end of file From 7f497b22a2b8c82d669437d85011a9ec3538da1f Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 15:31:25 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PowerAxisStructController.java | 18 ------------ .../modules/axis/dao/PowerAxisStructDao.java | 10 ------- .../axis/service/PowerAxisStructService.java | 10 ------- .../impl/PowerAxisStructServiceImpl.java | 17 ----------- .../mapper/poweraxis/PowerAxisStructDao.xml | 28 ------------------- 5 files changed, 83 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java index 2195d89..250a4f8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java @@ -119,24 +119,6 @@ public class PowerAxisStructController { return new Result(); } - /** - * 获取上级网格党支部 - */ - @PostMapping("/GridPartyBranchList") - public Result> getGridPartyBranchList() { - List list = powerAxisStructService.getGridPartyBranchList(); - return new Result>().ok(list); - } - - /** - * 获取上级组织 - */ - @PostMapping("/getPartyCommList") - public Result> getPartyCommList() { - List list = powerAxisStructService.getPartyCommList(); - return new Result>().ok(list); - } - /** * 根据节点接报，组装其上级节点树 * diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 691fef9..32ab682 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -40,16 +40,6 @@ public interface PowerAxisStructDao extends BaseDao { void delete(String id); - /** - * 获取上级网格党支部 - */ - List getGridPartyBranchList(String customerId); - - /** - * 获取上级党委 - */ - List getPartyCommList(String customerId); - /** * 查询同组织下是否有同名的节点 * diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 59ac9fd..d1910a7 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -101,16 +101,6 @@ public interface PowerAxisStructService extends BaseService getGridPartyBranchList(); - - /** - * 获取上级党委列表 - */ - List getPartyCommList(); - /** * 根据id查询修改表单数据 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 2e7cc28..af51fe0 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -211,23 +211,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getGridPartyBranchList() { - String customerId = loginUserUtil.getLoginUserCustomerId(); - List list = baseDao.getGridPartyBranchList(customerId); - return list; - } - - @Override - public List getPartyCommList() { - String customerId = loginUserUtil.getLoginUserCustomerId(); - List list = baseDao.getPartyCommList(customerId); - return list; - } - @Override public PowerAxisStructEntity queryModifyById(String id) { PowerAxisStructEntity entity = baseDao.selectById(id); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index d5f8021..55ba437 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -88,34 +88,6 @@ - - + \ No newline at end of file From 99649622723cafe2daa0fcf4696c9a9f77e054fc Mon Sep 17 00:00:00 2001 From: YUJT Date: Sat, 23 Apr 2022 15:58:29 +0800 Subject: [PATCH 30/36] append --- .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 67c41e1..3686754 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -149,7 +149,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ONE) { + if (structLevel - parentStructLevel > NumConstant.ONE) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法跨级添加节点"); } } From 54f754ed43f84bb34ed4f4c0971def3c7cdedbea Mon Sep 17 00:00:00 2001 From: HAHA Date: Sun, 24 Apr 2022 10:58:47 +0800 Subject: [PATCH 31/36] =?UTF-8?q?message:=20=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=90=8C=E4=B8=80=E7=88=B6?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8B=E4=B8=8D=E8=83=BD=E6=9C=89=E9=87=8D?= =?UTF-8?q?=E5=90=8D=E5=AD=90=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 2 +- .../axis/service/impl/PowerServiceStationServiceImpl.java | 2 +- .../src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 3686754..36c9d6d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -154,7 +154,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一节点下不允许添加同名的子节点"); } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java index ad2c5ef..25d9c99 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java @@ -64,7 +64,7 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) .eq(StringUtils.isNotBlank(name), "NAME", name) - .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", name); + .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId); return wrapper; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index c7909b1..dc91855 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -105,6 +105,7 @@ AND s.ID != #{id} + AND s.pid = #{pid} + SELECT + l.ID, + l.`NAME` , + l.MOBILE + FROM + pli_power_axis_struct s + LEFT JOIN pli_power_axis_struct_leader sl ON s.ID = sl.STRUCT_REFERENCE_ID + LEFT JOIN pli_power_axis_leader l ON sl.LEADER_ID = l.ID + WHERE + s.DEL_FLAG = '0' + AND sl.DEL_FLAG = '0' + AND s.CUSTOMER_ID = #{customerId} + AND ( s.ID = #{axisStructId} OR PIDS LIKE '%${axisStructId}%' ) + AND (l.`NAME` LIKE '%${keyWord}%' OR l.MOBILE LIKE '%${keyWord}%') + GROUP BY + l.ID + ORDER BY + s.CREATED_TIME, + s.SORT + \ No newline at end of file From b48a0b7fbb98f335250e6272dc802842c36fa312 Mon Sep 17 00:00:00 2001 From: HAHA Date: Sun, 24 Apr 2022 19:33:39 +0800 Subject: [PATCH 33/36] =?UTF-8?q?message:=20=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power/dto/axis/PowerAxisStructDTO.java | 5 + .../modules/axis/dao/PowerAxisStructDao.java | 16 +++- .../axis/dao/PowerKernelHouseholdDao.java | 8 +- .../impl/PowerAxisStructServiceImpl.java | 8 +- .../impl/PowerKernelHouseholdServiceImpl.java | 10 +- .../mapper/poweraxis/PowerAxisStructDao.xml | 18 +++- .../poweraxis/PowerKernelHouseholdDao.xml | 95 ++++++++++++++----- 7 files changed, 124 insertions(+), 36 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java index bf4a256..6a476d2 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java @@ -1,6 +1,7 @@ package com.epmet.plugin.power.dto.axis; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -57,6 +58,10 @@ public class PowerAxisStructDTO implements Serializable { */ private String pids; + private BigDecimal longitude; + + private BigDecimal latitude; + /** * 类别编码 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 32ab682..875d679 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -75,9 +75,9 @@ public interface PowerAxisStructDao extends BaseDao { List getIdsByAgencyId(String agencyId, String customerId); - int queryGridParty(PowerAxisStructViewFormDTO form); + int queryGridParty(PowerAxisStructViewFormDTO form,String gridCateGoryCode); - int queryGroupParty(PowerAxisStructViewFormDTO form); + int queryGroupParty(PowerAxisStructViewFormDTO form,String groupCateGoryCode); int getKernelHouseHold(PowerAxisStructViewFormDTO form); @@ -102,4 +102,16 @@ public interface PowerAxisStructDao extends BaseDao { * @date 2022/4/23/0023 14:38 */ List listParentTreeByLevel(@Param("structLevel") int structLevel, @Param("customerId") String customerId); + + /** + * 查询cateGoryCode + * + * @param customerId + * @param level + * @param tagCateGory + * @return java.lang.String + * @author LZN + * @date 2022/4/24 19:29 + */ + String getCateGoryCode(String customerId, int level, String tagCateGory); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java index b3bd63a..77add6e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java @@ -10,6 +10,7 @@ import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResult import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,10 +28,15 @@ public interface PowerKernelHouseholdDao extends BaseDao getListPosition(PowerKernelListPostitionFormDTO form); + List getListPosition(PowerKernelListPostitionFormDTO form,List axisStructIds); long getListTotal(PowerKernelListPostitionFormDTO form); List queryHouseIdList(String[] houseIdList, String customerId,String axisStructId); + + + List queryIds(String customerId, String axisStructId); + + List queryListPosition(String axisStructId, String customerId, int limit); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 36c9d6d..6998094 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -228,10 +228,14 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -130,11 +135,10 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getListPosition(PowerKernelListPostitionFormDTO form) { - form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - List dto = baseDao.getListPosition(form); - return dto; + return baseDao.queryListPosition(form.getAxisStructId(),form.getCustomerId(),form.getLimit()); } + @Override public long getListTotal(PowerKernelListPostitionFormDTO form) { form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index dc91855..9e1f729 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -50,7 +50,7 @@ left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID left join pli_power_axis_leader l on l.ID = sl.LEADER_ID left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE - where s.DEL_FLAG = '0' + where s.DEL_FLAG = '0' and sl.del_flag = '0' and l.del_flag = '0' and s.AGENCY_ID = #{agencyId} @@ -127,7 +127,7 @@ WHERE AGENCY_ID = #{agencyId} AND - CATEGORY_CODE = 'grid_party' + CATEGORY_CODE = #{gridCateGoryCode} AND customer_id = #{customerId} @@ -139,7 +139,7 @@ WHERE AGENCY_ID = #{agencyId} AND - CATEGORY_CODE = 'group_party' + CATEGORY_CODE = #{groupCateGoryCode} AND customer_id = #{customerId} @@ -216,6 +216,18 @@ AND struct.customer_id = #{customerId} AND tag.struct_level < #{structLevel} + \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index de269cf..0c08a74 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -22,14 +22,20 @@ + + \ No newline at end of file From caf2d4d1922fa34bfb92bb0c6eca0e0a41e21671 Mon Sep 17 00:00:00 2001 From: YUJT Date: Sun, 24 Apr 2022 19:37:45 +0800 Subject: [PATCH 34/36] append --- .../dto/axis/form/StructLeaderBriefFormDTO.java | 12 ++++++++++++ .../dto/axis/result/PowerAxisSimpleListDTO.java | 6 +++++- .../controller/PowerAxisStructLeaderController.java | 9 +++++++++ .../modules/axis/dao/PowerAxisStructLeaderDao.java | 13 ++++++++++--- .../axis/service/PowerAxisStructLeaderService.java | 11 ++++++++++- 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java index fded377..372d0ee 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBriefFormDTO.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @Data @@ -13,10 +14,21 @@ public class StructLeaderBriefFormDTO implements Serializable { private static final long serialVersionUID = 523592353978009455L; + /** + * 节点级别 + */ + @NotBlank(message = "节点级别不能为空") private int structLevel; + /** + * 节点ID + */ + @NotBlank(message = "绑定节点不能为空") private String axisStructId; + /** + * 手机号或姓名 + */ private String keyWord; private String customerId; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java index 58ae108..c87ce5a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java @@ -2,8 +2,12 @@ package com.epmet.plugin.power.dto.axis.result; import lombok.Data; +import java.io.Serializable; + @Data -public class PowerAxisSimpleListDTO { +public class PowerAxisSimpleListDTO implements Serializable { + + private static final long serialVersionUID = 1760957932589482970L; private String id; private String name; private String mobile; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java index 418af81..cb45e25 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java @@ -81,6 +81,15 @@ public class PowerAxisStructLeaderController { ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisStructLeaderExcel.class); } + /** + * 查询当前组织下绑定的所有负责人 + * + * @param tokenDto 用户信息 + * @param formDto 查询条件 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ @PostMapping("listbrief") public Result> listLeaderByStructId(@LoginUser TokenDto tokenDto, @RequestBody StructLeaderBriefFormDTO formDto) { return new Result().ok(powerAxisStructLeaderService.listLeaderByStructId(tokenDto, formDto)); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java index 2412501..f95a615 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 动力主轴负责人关系 + * 动力主轴负责人关系 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-19 @@ -18,8 +18,15 @@ import java.util.List; @Mapper public interface PowerAxisStructLeaderDao extends BaseDao { - PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId,String customerId); - + PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId, String customerId); + /** + * 查询当前组织下绑定的所有负责人 + * + * @param formDto 查询条件 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ List listLeaderBriefByRootStructId(StructLeaderBriefFormDTO formDto); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java index 0da7c77..680fb08 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; /** - * 动力主轴负责人关系 + * 动力主轴负责人关系 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-19 @@ -85,5 +85,14 @@ public interface PowerAxisStructLeaderService extends BaseService + * @author work@yujt.net.cn + * @date 2022/4/24/0024 19:35 + */ List listLeaderByStructId(TokenDto tokenDto, StructLeaderBriefFormDTO formDto); } \ No newline at end of file From 8fc78597cd3ebbeeef42558232976ac02d5fa86d Mon Sep 17 00:00:00 2001 From: HAHA Date: Sun, 24 Apr 2022 19:41:23 +0800 Subject: [PATCH 35/36] =?UTF-8?q?message:=20=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/axis/dao/PowerAxisStructDao.java | 4 ++-- .../axis/service/PowerAxisLeaderService.java | 10 +++++++++ .../service/PowerAxisStructLeaderService.java | 5 +++++ .../axis/service/PowerAxisStructService.java | 21 +++++++++++++++++++ .../impl/PowerAxisStructServiceImpl.java | 4 ++-- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 875d679..1f53238 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -107,8 +107,8 @@ public interface PowerAxisStructDao extends BaseDao { * 查询cateGoryCode * * @param customerId - * @param level - * @param tagCateGory + * @param level + * @param tagCateGory * @return java.lang.String * @author LZN * @date 2022/4/24 19:29 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java index 7a71334..ebf4dec 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java @@ -81,11 +81,21 @@ public interface PowerAxisLeaderService extends BaseService + * @author LZN + * @date 2022/4/24 19:38 */ List getSimpleList(List ids); /** * 动力主轴负责人详细信息 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO + * @author LZN + * @date 2022/4/24 19:38 */ PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO form); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java index 680fb08..4bf5a11 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java @@ -82,6 +82,11 @@ public interface PowerAxisStructLeaderService extends BaseService + * @author LZN + * @date 2022/4/24 19:39 */ List getIdByAgencyId(String agencyId); /** + * * 关键指标统计 + * + * @param form + * @return com.epmet.plugin.power.dto.axis.result.PowerAxisStructViewResultDTO + * @author LZN + * @date 2022/4/24 19:40 */ PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form); /** * 树结构 + * + * @param form + * @return java.util.List + * @author LZN + * @date 2022/4/24 19:40 */ List getStructTree(PowerAxisStructStructTreeFormDTO form); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 6998094..c93c012 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -229,12 +229,12 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl Date: Mon, 25 Apr 2022 09:23:20 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axis/form/StructLeaderBindFormDTO.java | 37 +++++++++++++++++++ .../PowerAxisStructLeaderController.java | 16 ++++++++ .../axis/dao/PowerAxisStructLeaderDao.java | 15 ++++++++ .../service/PowerAxisStructLeaderService.java | 12 ++++++ .../impl/PowerAxisLeaderServiceImpl.java | 13 ++----- .../PowerAxisStructLeaderServiceImpl.java | 20 ++++++---- .../poweraxis/PowerAxisStructLeaderDao.xml | 3 ++ 7 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBindFormDTO.java diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBindFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBindFormDTO.java new file mode 100644 index 0000000..942c29d --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/StructLeaderBindFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class StructLeaderBindFormDTO implements Serializable { + + private static final long serialVersionUID = 523592353978009455L; + + /** + * 节点ID + */ + @NotBlank(message = "绑定节点不能为空") + private String axisStructId; + + /** + * 负责人ID + */ + @NotBlank(message = "绑定负责人不能为空") + private String leaderId; + + /** + * 负责人类别 + */ + @NotBlank(message = "负责人类别不能为空") + private String categoryCode; + + + private String customerId; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java index cb45e25..213d2d4 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructLeaderController.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.StructLeaderBindFormDTO; import com.epmet.plugin.power.dto.axis.form.StructLeaderBriefFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.excel.PowerAxisStructLeaderExcel; @@ -95,5 +96,20 @@ public class PowerAxisStructLeaderController { return new Result().ok(powerAxisStructLeaderService.listLeaderByStructId(tokenDto, formDto)); } + /** + * 绑定节点负责人 + * + * @param tokenDto 用户信息 + * @param formDto 表单信息 + * @return com.epmet.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2022/4/25/0025 9:21 + */ + @PostMapping("bind") + public Result bindAxisStructLeader(@LoginUser TokenDto tokenDto, @RequestBody StructLeaderBindFormDTO formDto) { + powerAxisStructLeaderService.bindAxisStructLeader(tokenDto, formDto); + return new Result(); + } + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java index f95a615..db7c98a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java @@ -6,6 +6,7 @@ import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,4 +30,18 @@ public interface PowerAxisStructLeaderDao extends BaseDao listLeaderBriefByRootStructId(StructLeaderBriefFormDTO formDto); + + /** + * 删除节点负责人 + * + * @param customerId 客户ID + * @param axisStructId 节点ID + * @param leaderId 负责人ID + * @return void + * @author work@yujt.net.cn + * @date 2022/4/25/0025 9:16 + */ + void deleteStructLeader(@Param("customerId") String customerId, + @Param("axisStructId") String axisStructId, + @Param("leaderId") String leaderId); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java index 4bf5a11..d650592 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.StructLeaderBindFormDTO; import com.epmet.plugin.power.dto.axis.form.StructLeaderBriefFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; @@ -100,4 +101,15 @@ public interface PowerAxisStructLeaderService extends BaseService listLeaderByStructId(TokenDto tokenDto, StructLeaderBriefFormDTO formDto); + + /** + * 绑定节点负责人 + * + * @param tokenDto 用户信息 + * @param formDto 表单信息 + * @return void + * @author work@yujt.net.cn + * @date 2022/4/25/0025 9:21 + */ + void bindAxisStructLeader(TokenDto tokenDto, StructLeaderBindFormDTO formDto); } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java index 7d8b8d6..70b91c6 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java @@ -93,7 +93,9 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl getSimpleList(List ids) { String customerId = loginUserUtil.getLoginUserCustomerId(); - return baseDao.getSimpleList(ids,customerId); + return baseDao.getSimpleList(ids, customerId); } @Override @@ -119,13 +121,6 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.eq(PowerAxisStructLeaderEntity::getStructReferenceId, structId) - .eq(PowerAxisStructLeaderEntity::getCustomerId, customerId); - powerAxisStructLeaderDao.delete(lqw); - } - private void addStructLeaderRelation(String customerId, String structId, String leaderId, String categoryCode) { PowerAxisStructLeaderEntity structLeader = new PowerAxisStructLeaderEntity(); structLeader.setCustomerId(customerId); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java index 5d67ea5..df73902 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java @@ -14,11 +14,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.plugin.power.dto.axis.form.StructLeaderBindFormDTO; import com.epmet.plugin.power.dto.axis.form.StructLeaderBriefFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.enums.PowerTagLevelEnum; -import com.epmet.plugin.power.modules.axis.dao.PowerAxisLeaderDao; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao; import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO; @@ -43,15 +43,9 @@ import java.util.Map; @Service public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl implements PowerAxisStructLeaderService { -// @Autowired -// private PowerAxisStructLeaderRedis powerAxisStructLeaderRedis; - @Autowired private LoginUserUtil loginUserUtil; - @Autowired - private PowerAxisLeaderDao powerAxisLeaderDao; - @Autowired private PowerAxisStructDao powerAxisStructDao; @@ -141,4 +135,16 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl + + delete from pli_power_axis_struct_leader where CUSTOMER_ID = #{customerId} and STRUCT_REFERENCE_ID = #{axisStructId} and LEADER_ID = #{leaderId} +