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 4df180c..a2993a6 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 @@ -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 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; } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelMemberDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelMemberDTO.java new file mode 100644 index 0000000..3ab7268 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/KernelMemberListFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/KernelMemberListFormDTO.java new file mode 100644 index 0000000..68dbf17 --- /dev/null +++ b/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; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFromDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFromDTO.java new file mode 100644 index 0000000..0746b7b --- /dev/null +++ b/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; + + +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelMemFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelMemFormDTO.java new file mode 100644 index 0000000..f309484 --- /dev/null +++ b/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 kernelMemberList; + + 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/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 index 4b828f2..7e8f80c 100644 --- 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 @@ -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 kernelMemberList; + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerkernelMemberListResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerkernelMemberListResultDTO.java new file mode 100644 index 0000000..7b9c224 --- /dev/null +++ b/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; +} 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 12b2ef8..9d7c490 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 @@ -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> page(@RequestParam Map params){ - PageData page = powerKernelHouseholdService.page(params); - return new Result>().ok(page); + public ResultDTO page(@RequestBody PowerKernelHouseFromDTO form) { + PageData page = powerKernelHouseholdService.page(form); + return ResultDTO.success("成功", page, powerKernelHouseholdService.getPageTotal(form)); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { PowerKernelHouseholdDTO data = powerKernelHouseholdService.get(id); return new Result().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(); } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelMemberController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelMemberController.java new file mode 100644 index 0000000..b5d158e --- /dev/null +++ b/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> page(@RequestParam Map params) { + PageData page = powerKernelMemberService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + PowerKernelMemberDTO data = powerKernelMemberService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { + List 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(); + } + +} 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 2dd0035..f3943a7 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 @@ -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 queryIds(String customerId, String axisStructId); List queryListPosition(String axisStructId, String customerId, int limit); + + + PageData 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); } \ 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/PowerKernelMemberDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelMemberDao.java new file mode 100644 index 0000000..f9cf629 --- /dev/null +++ b/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 { + + + void deleteBind(String houseId, 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/entity/PowerKernelMemberEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelMemberEntity.java new file mode 100644 index 0000000..a541001 --- /dev/null +++ b/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; + +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelMemberExcel.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelMemberExcel.java new file mode 100644 index 0000000..0a82bb7 --- /dev/null +++ b/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; + + +} \ 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/redis/PowerKernelMemberRedis.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerKernelMemberRedis.java new file mode 100644 index 0000000..21a2b5e --- /dev/null +++ b/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; + } + +} \ 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/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 080b8bc..b140549 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,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 * @author generator * @date 2022-04-18 */ - PageData page(Map params); + PageData page(PowerKernelHouseFromDTO form); /** * 默认查询 @@ -99,4 +100,5 @@ public interface PowerKernelHouseholdService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-04-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-04-26 + */ + List list(Map 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); +} \ 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 71c7a9c..2ce3403 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 @@ -258,19 +258,19 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form) { + public List 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 list = baseDao.querylistPosition(customerId, code ,form.getAgencyId()); + List 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); 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 6bb4233..bc1da09 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 @@ -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 page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PowerKernelHouseholdDTO.class); + public PageData 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 implements PowerKernelMemberService { + + @Autowired + private PowerKernelMemberRedis powerKernelMemberRedis; + + @Autowired + private LoginUserUtil loginUserUtil; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PowerKernelMemberDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PowerKernelMemberDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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 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); + } + + +} \ 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 d3347a8..25eb9fd 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 @@ -60,6 +60,7 @@ and l.NAME like '%${leaderName}%' + order by s.sort,s.CREATED_TIME,l.CREATED_TIME @@ -144,10 +145,15 @@ customer_id = #{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/PowerKernelMemberDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelMemberDao.xml new file mode 100644 index 0000000..68c5eb4 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelMemberDao.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + DELETE + FROM + pli_power_kernel_member m + WHERE + m.CUSTOMER_ID = #{customerId} + AND m.HOUSE_ID = #{houseId} + + + + \ No newline at end of file