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 index a05c49f..3e246c2 100644 --- 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 @@ -12,8 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Random; -import java.util.UUID; /*** * 动力主轴相关数据可视化接口 @@ -45,9 +43,8 @@ public class PowerAxisDataVisualController { * @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)); + public Result> getListPostition(@RequestBody PowerAxisServiceStationFormDTO form) { + return new Result().ok(powerServiceStationService.getListPosition(form)); } /** @@ -101,14 +98,13 @@ public class PowerAxisDataVisualController { * @date 2022/4/23 10:19 */ @PostMapping("axis/{structLevel}/listPosition") - public ResultDTO getListPosition(@PathVariable int structLevel,@RequestBody PowerAxisDataListPositionFormDTO form) { - List list = powerAxisStructService.getListPosition(structLevel,form); - return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel,form)); + public Result> getListPosition(@PathVariable int structLevel, @RequestBody PowerAxisDataListPositionFormDTO form) { + return new Result().ok(powerAxisStructService.getListPosition(structLevel, form)); } /** - * 党员中心户列表 + * 党员中心户分页列表 * * @param form * @return com.epmet.plugin.power.dto.axis.ResultDTO @@ -130,9 +126,8 @@ public class PowerAxisDataVisualController { * @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)); + public Result> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form) { + return new Result().ok(powerKernelHouseholdService.getListPosition(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 9d7c490..7c3c707 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 @@ -1,8 +1,11 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -21,6 +24,7 @@ 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; +import lombok.extern.java.Log; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; @@ -46,9 +50,9 @@ public class PowerKernelHouseholdController { @RequestMapping("page") - public ResultDTO page(@RequestBody PowerKernelHouseFromDTO form) { - PageData page = powerKernelHouseholdService.page(form); - return ResultDTO.success("成功", page, powerKernelHouseholdService.getPageTotal(form)); + public Result> page(@RequestParam Map params, @LoginUser TokenDto tokenDto) { + params.put(FieldConstant.CUSTOMER_ID_HUMP, tokenDto.getCustomerId()); + return new Result().ok(powerKernelHouseholdService.page(params)); } @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) 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 3146d03..401925c 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 @@ -89,9 +89,6 @@ public interface PowerAxisStructDao extends BaseDao { List querylistPosition(@Param("customerId") String customerId,@Param("code") String code ,@Param("agencyId") String agencyId); - - long queryTotal(@Param("customerId") String customerId,@Param("code") String code,@Param("agencyId") String agencyId); - /** * 根据节点接报，组装其上级节点树 * 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 f3943a7..4e12468 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,10 +2,7 @@ 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; @@ -15,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 动力主轴党员中心户 @@ -32,8 +30,6 @@ public interface PowerKernelHouseholdDao extends BaseDao getListPosition(PowerKernelListPostitionFormDTO form, List axisStructIds); - long getListTotal(PowerKernelListPostitionFormDTO form); - /** * 根据节点ID查询已绑定的房屋ID * @@ -54,11 +50,6 @@ public interface PowerKernelHouseholdDao extends BaseDao 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); + List getPage(Map params); - 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 index f9cf629..78c53a5 100644 --- 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 @@ -4,6 +4,7 @@ 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 org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,6 +17,14 @@ import java.util.List; @Mapper public interface PowerKernelMemberDao extends BaseDao { - - void deleteBind(String houseId, String customerId); + /** + * 删除中心党员绑定关系 + * + * @param houseId 房屋ID + * @param customerId 客户ID + * @return void + * @author LZN + * @date 2022/4/26/0026 16:31 + */ + void deleteBind(@Param("houseId") String houseId, @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/dao/PowerServiceStationDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java index b20c58b..e95715d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java @@ -20,5 +20,4 @@ public interface PowerServiceStationDao extends BaseDao getListPosition(PowerAxisServiceStationFormDTO form); - long queryTotal(PowerAxisServiceStationFormDTO 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/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 0c7771d..29a10ef 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 @@ -111,7 +111,6 @@ public interface PowerAxisStructService extends BaseService getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form); - long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form); - /** * 根据节点接报，组装其上级节点树 * 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 b140549..7b9dab5 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,7 +6,6 @@ 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; @@ -27,12 +26,12 @@ public interface PowerKernelHouseholdService extends BaseService * @author generator * @date 2022-04-18 */ - PageData page(PowerKernelHouseFromDTO form); + PageData page(Map params); /** * 默认查询 @@ -95,10 +94,7 @@ public interface PowerKernelHouseholdService extends BaseService getListPosition(PowerKernelListPostitionFormDTO form); - long getListTotal(PowerKernelListPostitionFormDTO form); - void bind(PowerKernelHouseFormDTO form); - 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/service/PowerServiceStationService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java index e503ba4..cecdd1e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java @@ -82,5 +82,4 @@ public interface PowerServiceStationService extends BaseService getListPosition(PowerAxisServiceStationFormDTO form); - long queryTotal(PowerAxisServiceStationFormDTO 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 2ce3403..cddd027 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 @@ -269,18 +269,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl listParentTreeByLevel(String structLevel, String customerId) { List result = baseDao.listParentTreeByLevel(Integer.parseInt(structLevel), 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 bc1da09..8d0e09b 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 @@ -5,6 +5,7 @@ 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.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; @@ -51,9 +52,16 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl page(PowerKernelHouseFromDTO form) { - String customerId = loginUserUtil.getLoginUserCustomerId(); - return baseDao.getPage(form.getAxisStructId(),form.getKernelMemberName(),form.getLimit(),form.getPage(),customerId); + public PageData page(Map params) { + + //分页 + IPage page = getPage(params); + + //查询 + List list = baseDao.getPage(params); + + return getPageData(list, page.getTotal(), PowerKernelHouseholdDTO.class); + } @Override @@ -125,13 +133,6 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl implements PowerServiceStationService { - @Autowired - private PowerServiceStationRedis powerServiceStationRedis; @Autowired private LoginUserUtil loginUser; @@ -104,11 +100,4 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl - + - + - + @@ -163,7 +153,7 @@ - + @@ -182,29 +172,18 @@ h.ADDRESS FROM pli_power_kernel_household h - LEFT JOIN pli_power_kernel_member m ON h.HOUSE_ID = m.HOUSE_ID + LEFT JOIN pli_power_kernel_member m ON h.HOUSE_ID = m.HOUSE_ID AND m.DEL_FLAG = '0' WHERE - h.STRUCT_REFERENCE_ID = #{axisStructId} - AND KERNEL_MEMBER_NAME LIKE '%${kernelMemberName}%' + h.DEL_FLAG = '0' + + AND 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} - - diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml index 2d81185..d846f0c 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml @@ -34,16 +34,6 @@ CUSTOMER_ID = #{customerId} limit #{limit} - \ No newline at end of file