diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/ResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/ResultDTO.java new file mode 100644 index 0000000..9daa58e --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/ResultDTO.java @@ -0,0 +1,42 @@ +package com.epmet.plugin.power.dto.axis; + +import lombok.Data; + +@Data +public class ResultDTO { + /** + * 状态码 + */ + int code; + /** + * 接口信息 + */ + String msg; + /** + * 返回数据 + */ + Object data; + /** + * 数据总条数 + */ + Long total; + + private final static String MSG_DEFAULT_SUCCESS = "success"; + private final static int CODE_DEFAULT_ERROR = 300; + + public ResultDTO() { + + } + + public ResultDTO(int code, String msg, Object data, Long total) { + this.code = code; + this.msg = msg; + this.data = data; + this.total = total; + } + + + public static ResultDTO success(String msg, Object data, long total) { + return new ResultDTO(0, msg, data, total); + } +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java new file mode 100644 index 0000000..26584e5 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java @@ -0,0 +1,9 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerAxisLeaderDetailFormDTO { + private String agencyId; + private String leaderId; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java new file mode 100644 index 0000000..6177579 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java @@ -0,0 +1,10 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerKernelHouseHoldViewListFormDTO { + private String axisStructId; + private int pageNo; + private int pageSize; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisLeaderDetailResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisLeaderDetailResultDTO.java new file mode 100644 index 0000000..0f118d4 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisLeaderDetailResultDTO.java @@ -0,0 +1,13 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAxisLeaderDetailResultDTO { + private String name; + private String gender; + private String mobile; + private String introduction; + private String categoryName; + private String avatar; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelHouseHoldViewListResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelHouseHoldViewListResultDTO.java new file mode 100644 index 0000000..04c826e --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelHouseHoldViewListResultDTO.java @@ -0,0 +1,10 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerKernelHouseHoldViewListResultDTO { + private String ownerName; + private String houseId; + private String address; +} 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 new file mode 100644 index 0000000..d639752 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java @@ -0,0 +1,32 @@ +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.result.PowerKernelHouseHoldViewListResultDTO; +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; + + + +@RestController +@RequestMapping("/data/kernelHousehold") +public class PowerAxiskernelHouseholdViewController { + + @Autowired + private PowerKernelHouseholdService powerKernelHouseholdService; + + + /** + * 党员中心户列表 + */ + @PostMapping("/list") + public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ + PowerKernelHouseHoldViewListResultDTO 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/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 5d59217..e17c6fe 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 @@ -4,6 +4,8 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import org.apache.ibatis.annotations.Mapper; @@ -17,4 +19,7 @@ import org.apache.ibatis.annotations.Mapper; public interface PowerKernelHouseholdDao extends BaseDao { + PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form); + + long getTotal(PowerKernelHouseHoldViewListFormDTO 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/entity/PowerKernelHouseholdEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java index ed8042e..e898588 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java @@ -36,13 +36,18 @@ public class PowerKernelHouseholdEntity extends BaseEpmetEntity { /** * 户主ID */ - private String ownerId; + private String ownerIdCard; /** * 户主姓名 */ private String ownerName; + /** + * 户主电话 + */ + private String ownerPhone; + /** * 房屋ID */ 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 2269a4e..5e17f31 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 @@ -6,6 +6,8 @@ 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.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import java.util.List; @@ -79,5 +81,10 @@ public interface PowerKernelHouseholdService extends BaseService - + + \ No newline at end of file