diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java index 87aa5c0..23cd758 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java @@ -1,8 +1,11 @@ package com.epmet.plugin.power.modules.axis.ViewController; import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerAxisStructViewFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisStructViewResultDTO; +import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService; import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -17,6 +20,8 @@ public class PowerAxisStructViewController { @Autowired private PowerAxisStructService powerAxisStructService; + @Autowired + private PowerAxisLeaderService powerAxisLeaderService; /** * 关键指标统计 @@ -26,4 +31,13 @@ public class PowerAxisStructViewController { PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form); return new Result().ok(result); } + + /** + * 动力主轴负责人详细信息 + */ + @PostMapping("/leader") + public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form){ + PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(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/PowerAxisLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java index b8b2a53..45406cc 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java @@ -2,6 +2,8 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity; import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity; @@ -20,4 +22,6 @@ public interface PowerAxisLeaderDao extends BaseDao { List getSimpleList(List ids); + + PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO 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/PowerAxisLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java index dbf1611..7a71334 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java @@ -3,6 +3,8 @@ 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.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity; @@ -81,4 +83,9 @@ public interface PowerAxisLeaderService extends BaseService getSimpleList(List ids); + + /** + * 动力主轴负责人详细信息 + */ + PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO 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/PowerAxisLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java index 5f89fc8..c260fff 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java @@ -7,6 +7,8 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO; import com.epmet.plugin.power.modules.axis.dao.PowerAxisLeaderDao; import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao; @@ -24,7 +26,7 @@ import java.util.List; import java.util.Map; /** - * 动力主轴领导人 + * 动力主轴领导人 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-04-18 @@ -51,8 +53,8 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); + 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); @@ -71,7 +73,7 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl NumConstant.ZERO) { diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml index 9e303d5..110a532 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml @@ -27,9 +27,10 @@ AVATAR, ID FROM - pli_power_axis_struct_leader + pli_power_axis_leader + LEFT JOIN - pli_power_axis_leader + pli_power_axis_struct_leader ON STRUCT_REFERENCE_ID = #{axisStructId}