新增动力主轴列表查询接口

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

@@ -31,6 +31,11 @@ public class PowerAxisStructLeaderDTO implements Serializable {
      */
 	private String structReferenceId;
 
+    /**
+     * 类别编码
+     */
+    private String categoryCode;
+
     /**
      * 负责人ID
      */

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

@@ -0,0 +1,36 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 动力主轴负责人查询条件
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-19
+ */
+@Data
+public class PowerAxisStructLeaderFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5824335172425203790L;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+
+    /**
+     * 动力主轴节点名称
+     */
+    private String axisName;
+
+    /**
+     * 动力主轴节点负责人
+     */
+    private String leaderName;
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 动力主轴负责人关系
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-19
+ */
+@Data
+public class PowerAxisStructLeaderResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3856848780174795601L;
+
+    /**
+     * 主键(关联动力主轴ID：AxisStructId)
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 上级主键
+     */
+    private String pid;
+
+    /**
+     * 上级主键路径 全部上级主键，以:拼接
+     */
+    private String pids;
+
+    /**
+     * 类别编码
+     */
+    private String categoryCode;
+
+    /**
+     * 排序 正序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 负责人ID
+     */
+    private String leaderId;
+
+    /**
+     * 负责人姓名
+     */
+    private String leaderName;
+
+    /**
+     * 负责人联系方式
+     */
+    private String leaderMobile;
+
+}

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

@@ -1,7 +1,6 @@
 package com.epmet.plugin.power.modules.axis.controller;
 
 
-
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -14,6 +13,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 
 
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.excel.PowerAxisStructExcel;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ import java.util.Map;
 
 
 /**
- * 动力主轴结构 
+ * 动力主轴结构
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-04-18
@@ -38,20 +39,20 @@ public class PowerAxisStructController {
     private PowerAxisStructService powerAxisStructService;
 
     @RequestMapping("page")
-    public Result<PageData<PowerAxisStructDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<PowerAxisStructDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<PowerAxisStructDTO> page = powerAxisStructService.page(params);
         return new Result<PageData<PowerAxisStructDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<PowerAxisStructDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<PowerAxisStructDTO> get(@PathVariable("id") String id) {
         PowerAxisStructDTO data = powerAxisStructService.get(id);
         return new Result<PowerAxisStructDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody PowerAxisStructDTO dto){
+    public Result save(@RequestBody PowerAxisStructDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         powerAxisStructService.save(dto);
@@ -60,7 +61,7 @@ public class PowerAxisStructController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody PowerAxisStructDTO dto){
+    public Result update(@RequestBody PowerAxisStructDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         powerAxisStructService.update(dto);
@@ -68,7 +69,7 @@ public class PowerAxisStructController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         powerAxisStructService.delete(ids);
@@ -81,6 +82,17 @@ public class PowerAxisStructController {
         ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisStructExcel.class);
     }
 
-
+    /**
+     * 查询动力主轴全部机构，用于前端组装展示树
+     *
+     * @param formDto 查询条件
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2022/4/19/0019 14:17
+     */
+    @PostMapping("list4Tree")
+    public Result<List<PowerAxisStructLeaderResultDTO>> selectAllForTree(@RequestBody PowerAxisStructLeaderFormDTO formDto) {
+        return new Result().ok(powerAxisStructService.selectAllForTree(formDto));
+    }
 
 }

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

@@ -2,16 +2,29 @@ package com.epmet.plugin.power.modules.axis.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
- * 动力主轴结构 
+ * 动力主轴结构
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-04-18
  */
 @Mapper
 public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
-	
+
+    /**
+     * 查询动力主轴全部机构，用于前端组装展示树
+     *
+     * @return java.util.List<com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2022/4/19/0019 14:03
+     */
+    List<PowerAxisStructLeaderResultDTO> selectAllForTree(PowerAxisStructLeaderFormDTO formDto);
 }

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

@@ -31,6 +31,11 @@ public class PowerAxisStructLeaderEntity extends BaseEpmetEntity {
      */
 	private String structReferenceId;
 
+    /**
+     * 类别编码
+     */
+    private String categoryCode;
+
     /**
      * 负责人ID
      */

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

@@ -4,13 +4,15 @@ 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.PowerAxisStructDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * 动力主轴结构 
+ * 动力主轴结构
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-04-18
@@ -76,4 +78,13 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      * @date 2022-04-18
      */
     void delete(String[] ids);
+
+    /**
+     * 查询动力主轴全部机构，用于前端组装展示树
+     *
+     * @return java.util.List<com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2022/4/19/0019 14:02
+     */
+    List<PowerAxisStructLeaderResultDTO> selectAllForTree(PowerAxisStructLeaderFormDTO formDto);
 }

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

@@ -8,6 +8,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.PowerAxisStructDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import com.epmet.plugin.power.modules.axis.redis.PowerAxisStructRedis;
@@ -85,4 +87,8 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PowerAxisStructLeaderResultDTO> selectAllForTree(PowerAxisStructLeaderFormDTO formDto) {
+        return baseDao.selectAllForTree(formDto);
+    }
 }

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

@@ -22,5 +22,33 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectAllForTree"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO">
+        select
+            s.ID,
+            s.NAME,
+            s.PID,
+            s.PIDS,
+            s.CATEGORY_CODE,
+            s.SORT,
+            s.CREATED_TIME,
+            sl.LEADER_ID,
+            l.NAME as LEADER_NAME,
+            l.MOBILE as LEADER_MOBILE
+        from pli_power_axis_struct s
+        left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID
+        left join pli_power_axis_leader l on l.ID = sl.LEADER_ID
+        where s.DEL_FLAG = '0'
+        <if test="agencyId != null and agencyId != ''">
+            and s.AGENCY_ID = #{agencyId}
+        </if>
+        <if test="axisName != null and axisName != ''">
+            and s.NAME like '%${axisName}%'
+        </if>
+        <if test="leaderName != null and leaderName != ''">
+            and l.NAME like '%${leaderName}%'
+        </if>
+    </select>
+
 
 </mapper>

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

@@ -8,6 +8,7 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="structReferenceId" column="STRUCT_REFERENCE_ID"/>
         <result property="leaderId" column="LEADER_ID"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>