Merge branch 'dev_example' into develop

README.md

@@ -1,7 +1,17 @@
 ## epmet-plugins
 
-党群e事通插件/外挂服务模块后端代码库
+**代码仓库描述：党群e事通插件/外挂服务模块后端代码库**
 
+ ### 代码库分支操作说明
+ 
+ #### 开发
+ - _从**master**分支上，创建新的分支，分支名一般以dev_为前缀。e.g. dev_example（以此为例进行说明）_
+ #### 开发环境部署
+ - _将dev_example分支的提交合并到**develop**分支上_
+ #### 测试环境部署
+ - _将dev_example分支的提交合并到**test**分支上_
+ #### 生产环境部署
+ - _将dev_example分支的提交合并到**master**分支上_
 
  ### 新建插件建议：
  > 建议在epmet-plugins-module模块下新建插件模块
@@ -9,7 +19,7 @@
  >>> 建议新模块的context-path以'/pli/'为前缀 
  
  ### 私服依赖下载
- > 本地maven的settings.xml文件，在<servers>标签下新建子元素，在account与password处，填入私服的账号密码
+ > 本地maven的settings.xml文件，在<**servers**>标签下新建子元素，在account与password处，填入私服的账号密码
  ```xml
 <server>
     <id>epmet</id>
@@ -17,7 +27,7 @@
     <password>${password}</password>
 </server>
  ```
- > 本地maven的settings.xml文件，在<mirrors>标签下新建子元素
+ > 本地maven的settings.xml文件，在<**mirrors**>标签下新建子元素
   ```xml
 <mirror>
     <id>epmet</id>

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
@@ -12,6 +13,7 @@ public class PowerKernelListPostitionFormDTO implements Serializable {
     /**
      * 动力主轴id
      */
+    @NotBlank(message = "动力主轴节点不能为空")
     private String axisStructId;
 
     /**

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@@ -1,6 +1,9 @@
 package com.epmet.plugin.power.modules.axis.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.plugin.power.dto.axis.ResultDTO;
 import com.epmet.plugin.power.dto.axis.form.*;
 import com.epmet.plugin.power.dto.axis.result.*;
@@ -126,7 +129,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("kernelHousehold/listPosition")
-    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form) {
+    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
+        ValidatorUtils.validateEntity(form);
+        form.setCustomerId(tokenDto.getCustomerId());
         return new Result().ok(powerKernelHouseholdService.getListPosition(form));
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -17,7 +16,6 @@ import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO;
-import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFromDTO;
 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;

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.3__kernelmember.sql

@@ -0,0 +1,39 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : prod[市北党群]--Elink@833066
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : epdc-shibei.mysql.rds.aliyuncs.com:3306
+ Source Schema         : epmet_pli_power
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 05/05/2022 09:56:08
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for pli_power_kernel_member
+-- ----------------------------
+DROP TABLE IF EXISTS `pli_power_kernel_member`;
+CREATE TABLE `pli_power_kernel_member`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `HOUSE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '房屋ID',
+  `KERNEL_MEMBER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '中心党员ID',
+  `KERNEL_MEMBER_NAME` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '中心党员名称',
+  `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '动力主轴中心党员 ' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;