message:

修改党员中心户列表
修改分页列表
补充绑定中心党员
完善查询党员中心户数

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

@@ -2,9 +2,12 @@ package com.epmet.plugin.power.dto.axis;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.epmet.plugin.power.dto.axis.result.PowerkernelMemberListResultDTO;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 动力主轴党员中心户
@@ -18,88 +21,84 @@ public class PowerKernelHouseholdDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * 业主名字
      */
-	private String id;
+    private String ownerName;
 
-    /**
-     * 客户ID
-     */
-	private String customerId;
 
     /**
-     * 关联动力主轴ID
+     * 业主身份证号码
      */
-	private String structReferenceId;
+    private String ownerIdCard;
 
     /**
-     * 户主ID
+     * 动力主轴节点id
      */
-	private String ownerId;
+    private String structReferenceId;
 
     /**
-     * 户主姓名
+     * 党员中心户主键
      */
-	private String ownerName;
+    private String id;
 
     /**
-     * 户主ID
+     * 经度
      */
-    private String ownerIdCard;
+    private String longitude;
 
     /**
-     * 户主电话
+     * 纬度
      */
-    private String ownerPhone;
+    private String latitude;
 
     /**
-     * 房屋ID
+     * 中心党员集合
      */
-	private String houseId;
+    private List<PowerkernelMemberListResultDTO> kernelMemberList;
 
     /**
-     * 房屋地址
+     * 中心党员名称，拼接
      */
-	private String address;
+    private String kernelMemberNameConcat;
 
     /**
-     * 房屋经度
+     * 房屋id
      */
-	private BigDecimal longitude;
+    private String houseId;
 
     /**
-     * 房屋纬度
+     * 房屋地址
      */
-	private BigDecimal latitude;
+    private String address;
 
     /**
      * 删除标识 0.未删除 1.已删除
      */
-	private String delFlag;
+    private String delFlag;
 
     /**
      * 乐观锁
      */
-	private Integer revision;
+    private Integer revision;
 
     /**
      * 创建人
      */
-	private String createdBy;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createdTime;
 
     /**
      * 更新人
      */
-	private String updatedBy;
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updatedTime;
 
 }

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

@@ -0,0 +1,75 @@
+package com.epmet.plugin.power.dto.axis;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+
+
+/**
+ * 动力主轴中心党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Data
+public class PowerKernelMemberDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+
+    /**
+     * 中心党员ID
+     */
+    private String kernelMemberId;
+
+    /**
+     * 中心党员名称
+     */
+    private String kernelMemberName;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+}

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

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KernelMemberListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3995765706947900077L;
+
+    /**
+     * 中心党员id
+     */
+    private String kernelMemberId;
+
+    /**
+     * 中心党员名字
+     */
+    private String kernelMemberName;
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PowerKernelHouseFromDTO implements Serializable {
+
+    private static final long serialVersionUID = -7635290892407810285L;
+
+    /**
+     * 动力主轴节点id
+     */
+    private String axisStructId;
+
+    /**
+     * 页码
+     */
+    private int page;
+
+    /**
+     * 页容量
+     */
+    private int limit;
+
+    /**
+     * 中心党员名称
+     */
+    private String kernelMemberName;
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PowerKernelMemFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8887473938988084546L;
+
+    /**
+     * 房屋id
+     */
+    private String houseId;
+
+    /**
+     * 中心党员ID集合
+     */
+    @NotEmpty(message = "请选择党员")
+    private List<KernelMemberListFormDTO> kernelMemberList;
+
+    private String customerId;
+
+
+}

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

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.dto.axis.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PowerKernelHouseHoldViewListResultDTO implements Serializable {
@@ -23,4 +24,15 @@ public class PowerKernelHouseHoldViewListResultDTO implements Serializable {
      * 房屋地址
      */
     private String address;
+
+    /**
+     * 中心党员名称，拼接
+     */
+    private String kernelMemberNameConcat;
+
+    /**
+     * 中心党员集合
+     */
+    private List<PowerkernelMemberListResultDTO> kernelMemberList;
+
 }

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

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PowerkernelMemberListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1059713841651104023L;
+
+    /**
+     * 中心党员id
+     */
+    private String kernelMemberId;
+
+    /**
+     * 中心党员名称
+     */
+    private String kernelMemberName;
+}

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

@@ -15,7 +15,9 @@ import com.epmet.dto.IcHouseDTO;
 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.ResultDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFromDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity;
 import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
@@ -43,22 +45,21 @@ public class PowerKernelHouseholdController {
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
 
-
     @RequestMapping("page")
-    public Result<PageData<PowerKernelHouseholdDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PowerKernelHouseholdDTO> page = powerKernelHouseholdService.page(params);
-        return new Result<PageData<PowerKernelHouseholdDTO>>().ok(page);
+    public ResultDTO page(@RequestBody PowerKernelHouseFromDTO form) {
+        PageData<PowerKernelHouseholdDTO> page = powerKernelHouseholdService.page(form);
+        return ResultDTO.success("成功", page, powerKernelHouseholdService.getPageTotal(form));
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<PowerKernelHouseholdDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<PowerKernelHouseholdDTO> get(@PathVariable("id") String id) {
         PowerKernelHouseholdDTO data = powerKernelHouseholdService.get(id);
         return new Result<PowerKernelHouseholdDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody PowerKernelHouseholdDTO dto){
+    public Result save(@RequestBody PowerKernelHouseholdDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         powerKernelHouseholdService.save(dto);
@@ -67,7 +68,7 @@ public class PowerKernelHouseholdController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody PowerKernelHouseholdDTO dto){
+    public Result update(@RequestBody PowerKernelHouseholdDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         powerKernelHouseholdService.update(dto);
@@ -75,7 +76,7 @@ public class PowerKernelHouseholdController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         powerKernelHouseholdService.delete(ids);
@@ -92,7 +93,7 @@ public class PowerKernelHouseholdController {
      * 为节点绑定党员中心户
      */
     @PostMapping("/bind")
-    public Result Bind(@RequestBody PowerKernelHouseFormDTO form){
+    public Result Bind(@RequestBody PowerKernelHouseFormDTO form) {
         powerKernelHouseholdService.bind(form);
         return new Result();
     }

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

@@ -0,0 +1,92 @@
+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;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.PowerKernelMemberDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerKernelMemFormDTO;
+import com.epmet.plugin.power.modules.axis.excel.PowerKernelMemberExcel;
+import com.epmet.plugin.power.modules.axis.service.PowerKernelMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.validation.Validator;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 动力主轴中心党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@RestController
+@RequestMapping("powerKernelMember")
+public class PowerKernelMemberController {
+
+    @Autowired
+    private PowerKernelMemberService powerKernelMemberService;
+
+    @RequestMapping("page")
+    public Result<PageData<PowerKernelMemberDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<PowerKernelMemberDTO> page = powerKernelMemberService.page(params);
+        return new Result<PageData<PowerKernelMemberDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<PowerKernelMemberDTO> get(@PathVariable("id") String id) {
+        PowerKernelMemberDTO data = powerKernelMemberService.get(id);
+        return new Result<PowerKernelMemberDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody PowerKernelMemberDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        powerKernelMemberService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody PowerKernelMemberDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        powerKernelMemberService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        powerKernelMemberService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PowerKernelMemberDTO> list = powerKernelMemberService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PowerKernelMemberExcel.class);
+    }
+
+    @PostMapping("/bind")
+    public Result bindKernelMember(@RequestBody PowerKernelMemFormDTO form, @LoginUser TokenDto tokenDto) {
+        ValidatorUtils.validateEntity(form);
+        form.setCustomerId(tokenDto.getCustomerId());
+        powerKernelMemberService.bindMem(form);
+        return new Result();
+    }
+
+}

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

@@ -2,7 +2,10 @@ package com.epmet.plugin.power.modules.axis.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.page.PageData;
+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;
@@ -49,4 +52,13 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
     List<String> queryIds(String customerId, String axisStructId);
 
     List<PowerKernelListPostitionResultDTO> queryListPosition(String axisStructId, String customerId, int limit);
+
+
+    PageData<PowerKernelHouseholdDTO> getPage(@Param("axisStructId") String axisStructId,
+                                              @Param("kernelMemberName") String kernelMemberName,
+                                              @Param("limit") int limit,
+                                              @Param("page") int page,
+                                              @Param("customerId") String customerId);
+
+    long getPageTotal(PowerKernelHouseFromDTO form);
 }

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

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.modules.axis.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.form.PowerKernelMemFormDTO;
+import com.epmet.plugin.power.modules.axis.entity.PowerKernelMemberEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 动力主轴中心党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Mapper
+public interface PowerKernelMemberDao extends BaseDao<PowerKernelMemberEntity> {
+
+
+    void deleteBind(String houseId, String customerId);
+}

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

@@ -0,0 +1,44 @@
+package com.epmet.plugin.power.modules.axis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 动力主轴中心党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("pli_power_kernel_member")
+public class PowerKernelMemberEntity extends BaseEpmetEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+
+    /**
+     * 中心党员ID
+     */
+    private String kernelMemberId;
+
+    /**
+     * 中心党员名称
+     */
+    private String kernelMemberName;
+
+}

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

@@ -0,0 +1,51 @@
+package com.epmet.plugin.power.modules.axis.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 动力主轴中心党员 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Data
+public class PowerKernelMemberExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "房屋ID")
+    private String houseId;
+
+    @Excel(name = "中心党员ID")
+    private String kernelMemberId;
+
+    @Excel(name = "中心党员名称")
+    private String kernelMemberName;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.axis.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 动力主轴中心党员 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Component
+public class PowerKernelMemberRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -6,6 +6,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 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;
@@ -26,12 +27,12 @@ public interface PowerKernelHouseholdService extends BaseService<PowerKernelHous
     /**
      * 默认分页
      *
-     * @param params
+     * @param form
      * @return PageData<PowerKernelHouseholdDTO>
      * @author generator
      * @date 2022-04-18
      */
-    PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params);
+    PageData<PowerKernelHouseholdDTO> page(PowerKernelHouseFromDTO form);
 
     /**
      * 默认查询
@@ -99,4 +100,5 @@ public interface PowerKernelHouseholdService extends BaseService<PowerKernelHous
     void bind(PowerKernelHouseFormDTO form);
 
 
+    long getPageTotal(PowerKernelHouseFromDTO form);
 }

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

@@ -0,0 +1,82 @@
+package com.epmet.plugin.power.modules.axis.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.plugin.power.dto.axis.PowerKernelMemberDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerKernelMemFormDTO;
+import com.epmet.plugin.power.modules.axis.entity.PowerKernelMemberEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 动力主轴中心党员 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+public interface PowerKernelMemberService extends BaseService<PowerKernelMemberEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PowerKernelMemberDTO>
+     * @author generator
+     * @date 2022-04-26
+     */
+    PageData<PowerKernelMemberDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PowerKernelMemberDTO>
+     * @author generator
+     * @date 2022-04-26
+     */
+    List<PowerKernelMemberDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PowerKernelMemberDTO
+     * @author generator
+     * @date 2022-04-26
+     */
+    PowerKernelMemberDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-26
+     */
+    void save(PowerKernelMemberDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-26
+     */
+    void update(PowerKernelMemberDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-04-26
+     */
+    void delete(String[] ids);
+
+
+    void bindMem(PowerKernelMemFormDTO form);
+}

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

@@ -258,19 +258,19 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     }
 
     @Override
-    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form) {
+    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel, PowerAxisDataListPositionFormDTO form) {
         PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
         dto.setCustomerId(customerId);
         dto.setStructLevel(structLevel);
         dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
         String code = baseDao.queryCategoryCode(dto);
-        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code ,form.getAgencyId());
+        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code, form.getAgencyId());
         return list;
     }
 
     @Override
-    public long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form) {
+    public long queryTotal(int structLevel, PowerAxisDataListPositionFormDTO form) {
         PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
         dto.setCustomerId(customerId);

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

@@ -15,6 +15,7 @@ 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;
@@ -50,12 +51,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
     @Override
-    public PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params) {
-        IPage<PowerKernelHouseholdEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PowerKernelHouseholdDTO.class);
+    public PageData<PowerKernelHouseholdDTO> page(PowerKernelHouseFromDTO form) {
+        String customerId = loginUserUtil.getLoginUserCustomerId();
+        return baseDao.getPage(form.getAxisStructId(),form.getKernelMemberName(),form.getLimit(),form.getPage(),customerId);
     }
 
     @Override
@@ -191,5 +189,10 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
         }
     }
 
+    @Override
+    public long getPageTotal(PowerKernelHouseFromDTO form) {
+        return baseDao.getPageTotal(form);
+    }
+
 
 }

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

@@ -0,0 +1,113 @@
+package com.epmet.plugin.power.modules.axis.service.impl;
+
+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.NumConstant;
+import com.epmet.commons.tools.page.PageData;
+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.KernelMemberListFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerKernelMemFormDTO;
+import com.epmet.plugin.power.modules.axis.dao.PowerKernelMemberDao;
+import com.epmet.plugin.power.dto.axis.PowerKernelMemberDTO;
+import com.epmet.plugin.power.modules.axis.entity.PowerKernelMemberEntity;
+import com.epmet.plugin.power.modules.axis.redis.PowerKernelMemberRedis;
+import com.epmet.plugin.power.modules.axis.service.PowerKernelMemberService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 动力主轴中心党员 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-26
+ */
+@Service
+public class PowerKernelMemberServiceImpl extends BaseServiceImpl<PowerKernelMemberDao, PowerKernelMemberEntity> implements PowerKernelMemberService {
+
+    @Autowired
+    private PowerKernelMemberRedis powerKernelMemberRedis;
+
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    @Override
+    public PageData<PowerKernelMemberDTO> page(Map<String, Object> params) {
+        IPage<PowerKernelMemberEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PowerKernelMemberDTO.class);
+    }
+
+    @Override
+    public List<PowerKernelMemberDTO> list(Map<String, Object> params) {
+        List<PowerKernelMemberEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PowerKernelMemberDTO.class);
+    }
+
+    private QueryWrapper<PowerKernelMemberEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PowerKernelMemberEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PowerKernelMemberDTO get(String id) {
+        PowerKernelMemberEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PowerKernelMemberDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PowerKernelMemberDTO dto) {
+        PowerKernelMemberEntity entity = ConvertUtils.sourceToTarget(dto, PowerKernelMemberEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PowerKernelMemberDTO dto) {
+        PowerKernelMemberEntity entity = ConvertUtils.sourceToTarget(dto, PowerKernelMemberEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public void bindMem(PowerKernelMemFormDTO form) {
+        // 先删除，后插入
+        baseDao.deleteBind(form.getHouseId(),form.getCustomerId());
+        List<PowerKernelMemberEntity> list = new ArrayList<>();
+        PowerKernelMemberEntity entity;
+        for (KernelMemberListFormDTO formDto : form.getKernelMemberList()) {
+            entity = new PowerKernelMemberEntity();
+            entity.setKernelMemberId(formDto.getKernelMemberId());
+            entity.setKernelMemberName(formDto.getKernelMemberName());
+            entity.setHouseId(form.getHouseId());
+            entity.setCustomerId(form.getCustomerId());
+            list.add(entity);
+        }
+        this.insertBatch(list);
+    }
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -60,6 +60,7 @@
         <if test="leaderName != null and leaderName != ''">
             and l.NAME like '%${leaderName}%'
         </if>
+        order by s.sort,s.CREATED_TIME,l.CREATED_TIME
     </select>
 
 
@@ -144,10 +145,15 @@
 	        customer_id = #{customerId}
     </select>
     <select id="getKernelHouseHold" resultType="java.lang.Integer">
-        select count(*) from pli_power_kernel_household where customer_id = #{customerId}
+        SELECT
+            count( DISTINCT HOUSE_ID )
+        FROM
+            pli_power_kernel_household
+        WHERE
+            del_flag = '0'
     </select>
     <select id="getServiceStation" resultType="java.lang.Integer">
-        select count(*) from pli_power_service_station where customer_id = #{customerId}
+        select count(*) from pli_power_service_station where del_flag = '0'
     </select>
     <select id="getStructTree"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">
@@ -165,6 +171,7 @@
             struct.DEL_FLAG = '0'
 	    AND struct.agency_id = #{agencyId}
 	    AND struct.customer_id = #{customerId}
+	    order by struct.sort,struct.CREATED_TIME,leader.CREATED_TIME
     </select>
     <select id="queryCategoryCode" resultType="java.lang.String">
         SELECT

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

@@ -66,21 +66,39 @@
                 AND h.DEL_FLAG = '0' AND h.CUSTOMER_ID = #{customerId}
                 and s.pids LIKE '%${axisStructId}%'
     </select>
+    <resultMap id="ListOfKernelMember" type="com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO">
+        <result property="ownerName" column="OWNER_NAME" />
+        <result property="houseId" column="HOUSE_ID" />
+        <result property="address" column="ADDRESS" />
+        <result property="kernelMemberNameConcat" column="KERNEL_MEMBER_NAME" />
+        <collection property="kernelMemberList" ofType="com.epmet.plugin.power.dto.axis.result.PowerkernelMemberListResultDTO">
+            <result property="kernelMemberId" column="KERNEL_MEMBER_ID" />
+            <result property="kernelMemberName" column="KERNEL_MEMBER_NAME" />
+        </collection>
+    </resultMap>
     <select id="getList"
-            resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO">
+            resultMap="ListOfKernelMember">
         SELECT
             k.OWNER_NAME,
             k.HOUSE_ID,
-            k.ADDRESS
+            k.ADDRESS,
+            m.KERNEL_MEMBER_ID,
+            m.KERNEL_MEMBER_NAME,
+            concat_ws(',',m.KERNEL_MEMBER_NAME) as kernelMemberNameConcat
         FROM
             pli_power_kernel_household k
         LEFT JOIN
             pli_power_axis_struct s
         ON
             s.id = k.STRUCT_REFERENCE_ID
+        LEFT JOIN
+            pli_power_kernel_member m
+        ON
+            k.HOUSE_ID = m.HOUSE_ID
         WHERE
             s.DEL_FLAG = '0'
         AND k.DEL_FLAG = '0'
+        AND m.DEL_FLAG = '0'
         AND k.CUSTOMER_ID = #{customerId}
         AND (s.pids LIKE '%${axisStructId}%'
         OR s.id = #{axisStructId})
@@ -134,6 +152,60 @@
                 ORDER BY s.SORT
                 limit #{limit}
     </select>
+    <resultMap id="getPageList" type="com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO">
+        <result property="ownerName" column="OWNER_NAME" />
+        <result property="ownerIdCard" column="OWNER_ID_CARD" />
+        <result property="structReferenceId" column="STRUCT_REFERENCE_ID" />
+        <result property="id" column="ID" />
+        <result property="longitude" column="LONGITUDE" />
+        <result property="latitude" column="LATITUDE" />
+        <collection property="kernelMemberList" ofType="com.epmet.plugin.power.dto.axis.result.PowerkernelMemberListResultDTO">
+            <result property="kernelMemberId" column="KERNEL_MEMBER_ID" />
+            <result property="kernelMemberName" column="KERNEL_MEMBER_NAME" />
+        </collection>
+        <result property="kernelMemberNameConcat" column="KERNEL_MEMBER_NAME" />
+        <result property="houseId" column="HOUSE_ID" />
+        <result property="address" column="ADDRESS" />
+    </resultMap>
+    <select id="getPage" resultMap="getPageList">
+        SELECT
+            h.OWNER_NAME,
+            h.OWNER_ID_CARD,
+            h.STRUCT_REFERENCE_ID,
+            h.ID,
+            h.LONGITUDE,
+            h.LATITUDE,
+            m.KERNEL_MEMBER_ID,
+            m.KERNEL_MEMBER_NAME,
+            CONCAT_WS( ',', KERNEL_MEMBER_NAME ) AS kernelMemberNameConcat,
+            h.HOUSE_ID,
+            h.ADDRESS
+        FROM
+            pli_power_kernel_household h
+            LEFT JOIN pli_power_kernel_member m ON h.HOUSE_ID = m.HOUSE_ID
+        WHERE
+            h.STRUCT_REFERENCE_ID = #{axisStructId}
+            AND KERNEL_MEMBER_NAME LIKE '%${kernelMemberName}%'
+            AND CUSTOMER_ID = #{customerId}
+            AND h.DEL_FLAG = '0'
+            AND m.DEL_FLAG = '0'
+        ORDER BY
+	        h.CREATED_TIME
+	    LIMIT #{page},#{limit}
+    </select>
+    <select id="getPageTotal" resultType="java.lang.Long">
+        SELECT
+            count(*)
+        FROM
+            pli_power_kernel_household h
+            LEFT JOIN pli_power_kernel_member m ON h.HOUSE_ID = m.HOUSE_ID
+        WHERE
+            h.STRUCT_REFERENCE_ID = #{axisStructId}
+        AND KERNEL_MEMBER_NAME LIKE '%${kernelMemberName}%'
+        AND h.DEL_FLAG = '0'
+        AND m.DEL_FLAG = '0'
+            LIMIT #{page},#{limit}
+    </select>
 
 
 </mapper>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelMemberDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.plugin.power.modules.axis.dao.PowerKernelMemberDao">
+
+    <resultMap type="com.epmet.plugin.power.modules.axis.entity.PowerKernelMemberEntity" id="powerKernelMemberMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="houseId" column="HOUSE_ID"/>
+        <result property="kernelMemberId" column="KERNEL_MEMBER_ID"/>
+        <result property="kernelMemberName" column="KERNEL_MEMBER_NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <delete id="deleteBind">
+        DELETE
+        FROM
+            pli_power_kernel_member m
+        WHERE
+            m.CUSTOMER_ID = #{customerId}
+            AND m.HOUSE_ID = #{houseId}
+    </delete>
+
+
+</mapper>