维护列表

cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java

@@ -12,7 +12,6 @@ import com.muyu.req.EngineVersionListResp;
 import com.muyu.service.EngIneService;
 import com.muyu.service.EngineVersionService;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
@@ -37,21 +36,45 @@ public class EngIneController extends BaseController {
     @Autowired
     EngineVersionService engineVersionService;
 
+    /**
+     * 规则列表+条件查询+分页
+     *
+     * @param engineMaintenanceQueryReq
+     * @return
+     */
     @PostMapping("/getMaintenanceList")
     public Result<PageResult<EngineMaintenance>> getMaintenanceList(@RequestBody EngineMaintenanceQueryReq engineMaintenanceQueryReq) {
         return engIneService.getMaintenanceList(engineMaintenanceQueryReq);
     }
 
+    /**
+     * 删除规则信息
+     *
+     * @param id
+     * @return
+     */
     @PostMapping("/delete/{id}")
     public Integer remove(@PathVariable Long id) {
         return engIneService.deletes(id);
     }
 
+    /**
+     * 修改规则信息
+     *
+     * @param engineMaintenance
+     * @return
+     */
     @PostMapping("/update")
     public Result<EngineMaintenance> update(@RequestBody EngineMaintenance engineMaintenance) {
         return engIneService.updateMsg(engineMaintenance);
     }
 
+    /**
+     * 添加规则信息
+     *
+     * @param engineMaintenance
+     * @return
+     */
     @PostMapping("/insert")
     public Result<EngineMaintenance> insert(@RequestBody EngineMaintenance engineMaintenance) {
         return engIneService.add(engineMaintenance);
@@ -133,8 +156,16 @@ public class EngIneController extends BaseController {
      */
     @GetMapping("/findByIds/{id}")
     public Result findVersionByIds(@PathVariable("id") Long id) {
-      return Result.success(engineVersionService.list(new LambdaQueryWrapper<>(){{
+        return Result.success(engineVersionService.list(new LambdaQueryWrapper<>() {{
-          eq(EngineVersion::getId,id);
+            eq(EngineVersion::getId, id);
         }}));
     }
+
+    /**
+     * 规则详情
+     */
+    @PostMapping("/selectEngineById/{id}")
+    public Result<EngineMaintenance> selectEngineById(@PathVariable("id") Long id) {
+        return engineVersionService.getByIds(id);
+    }
 }

cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java

@@ -1,10 +1,8 @@
 package com.muyu.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.domain.EngineMaintenance;
 import com.muyu.domain.EngineVersion;
 import com.muyu.domain.model.TestData;
 import com.muyu.req.EngineVersionQueryReq;
@@ -13,7 +11,6 @@ import com.muyu.resp.EngineConfigScopeResp;
 import com.muyu.resp.VersionClassCreateResp;
 import com.muyu.service.EngineVersionService;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,27 +38,51 @@ public class EngineVersionController {
         return Result.success(engineVersionService.list(EngineVersion.queryBuild(engineConfigQueryReq)));
     }
 
+    /**
+     * 查看版本列表
+     * @return
+     */
     @GetMapping("/selectVersionList")
     public Result<List<EngineVersion>> selectVersionList() {
         return Result.success(engineVersionService.list());
     }
 
+    /**
+     * 添加版本信息
+     * @param engineVersion
+     * @return
+     */
     @PostMapping("/insert")
     public Result<EngineVersion> insert(@RequestBody EngineVersion engineVersion) {
         return engineVersionService.add(engineVersion);
     }
 
+    /**
+     * 修改版本信息
+     * @param engineVersion
+     * @return
+     */
     @PostMapping("/update")
     public EngineVersion update(@RequestBody EngineVersion engineVersion) {
         return engineVersionService.updateMsg(engineVersion);
     }
 
+    /**
+     * 删除版本信息
+     * @param id
+     * @return
+     */
     @PostMapping("/delete/{id}")
     public Result delete(@PathVariable Long id) {
         boolean b = engineVersionService.removeById(id);
         return Result.success(b);
     }
 
+    /**
+     * 查询版本信息
+     * @param id
+     * @return
+     */
     @GetMapping("/getVersion/{id}")
     public Result<EngineVersion> getVersion(@PathVariable("id") Long id) {
         EngineVersion engineVersion = engineVersionService.getById(id);
@@ -112,8 +133,22 @@ public class EngineVersionController {
         engineMaintenanceExcelUtil.exportExcel(httpServletResponse, list, "规则引擎版本");
     }
 
+    /**
+     * 查询版本列表
+     * @param id
+     * @return
+     */
     @PostMapping("/selectListById/{id}")
     public Result selectListById(@PathVariable Long id){
         return Result.success(engineVersionService.getById(id));
     }
+
+
+    /**
+     * 添加版本信息
+     */
+    @PostMapping("/insertVersion")
+    public boolean insertVersion(@RequestBody EngineVersion engineVersion) {
+        return engineVersionService.save(engineVersion);
+    }
 }

cloud-etl-server/src/main/java/com/muyu/controller/Test.java

@@ -1,39 +0,0 @@
-//package com.muyu.controller;
-//
-//import lombok.extern.log4j.Log4j2;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * @Author：qdm
-// * @Package：com.muyu.controller
-// * @Project：cloud-etl-engine
-// * @name：Test
-// * @Date：2024/8/29 19:54
-// */
-//@Component
-//@Log4j2
-//public class Test {
-//    public static void main(String[] args) {
-//
-//        Student student = new Student();
-//
-//        student.setName("张");
-//
-//        if (student.getName().length() < 2 || student.getName().length() > 16) {
-//
-//            throw new RuntimeException("名称不合法");
-//
-//        }
-//
-//        student.setName("");
-//
-//        if (student.getAge() < 1 || student.getAge() > 120) {
-//
-//            throw new RuntimeException("名称不合法");
-//
-//        }
-//
-//        student.setAge(200);
-//
-//    }
-//}

cloud-etl-server/src/main/java/com/muyu/mapper/EnginLevelMapper.java

@@ -1,6 +1,5 @@
 package com.muyu.mapper;
 
-import com.muyu.controller.EngineLevelController;
 import com.muyu.domain.EngineLevelEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java

@@ -31,6 +31,4 @@ public interface EngineMapper extends BaseMapper<EngineMaintenance> {
     List<EngineMaintenance> getMaintenanceList(EngineMaintenanceQueryReq engineMaintenanceQueryReq);
 
     Integer deletes(@Param("id") Long id);
-
-//    List<EngineMaintenance> selectVersionList(@Param("versionId") Integer versionId);
 }

cloud-etl-server/src/main/java/com/muyu/mapper/EngineVersionMapper.java

@@ -1,8 +1,10 @@
 package com.muyu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.EngineMaintenance;
 import com.muyu.domain.EngineVersion;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Author：qdm
@@ -14,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface EngineVersionMapper extends BaseMapper<EngineVersion> {
     Integer add(EngineVersion engineVersion);
+
+    EngineMaintenance getByIds(@Param("id") Long id);
 }

cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java

@@ -45,6 +45,4 @@ public interface EngIneService extends IService<EngineMaintenance> {
     Integer deletes(Long id);
 
     Result forbiddenEngine(Integer id);
-//
-//    List<EngineMaintenance> selectVersionById(Integer versionId);
 }

cloud-etl-server/src/main/java/com/muyu/service/EngineVersionService.java

@@ -2,6 +2,7 @@ package com.muyu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.domain.Result;
+import com.muyu.domain.EngineMaintenance;
 import com.muyu.domain.EngineVersion;
 import com.muyu.domain.model.TestData;
 import com.muyu.req.VersionClassCreateReq;
@@ -41,5 +42,5 @@ public interface EngineVersionService extends IService<EngineVersion> {
 
     Result<EngineVersion> add(EngineVersion engineVersion);
 
-    EngineVersion getByIds(Long id);
+    Result<EngineMaintenance> getByIds(Long id);
 }

cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java

@@ -37,32 +37,6 @@ public class EngIneServiceImpl extends ServiceImpl<EngineMapper, EngineMaintenan
     @Override
     public List<EngineMaintenance> list() {
         LambdaQueryWrapper<EngineMaintenance> queryWrapper = new LambdaQueryWrapper<>();
-
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getName())) {
-//            queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getType())) {
-//            queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getScope())) {
-//            queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) {
-//            queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) {
-//            queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenance.getStatus())) {
-//            queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus());
-//        }
-
         return list(queryWrapper);
     }
 
@@ -150,42 +124,12 @@ public class EngIneServiceImpl extends ServiceImpl<EngineMapper, EngineMaintenan
 
     @Override
     public Result<PageResult<EngineMaintenance>> getMaintenanceList(EngineMaintenanceQueryReq engineMaintenanceQueryReq) {
-
-//        LambdaQueryWrapper<EngineMaintenance> queryWrapper = new LambdaQueryWrapper<>();
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getName())) {
-//            queryWrapper.like(EngineMaintenance::getName, engineMaintenanceQueryReq.getName());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getType())) {
-//            queryWrapper.eq(EngineMaintenance::getType, engineMaintenanceQueryReq.getType());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getScope())) {
-//            queryWrapper.eq(EngineMaintenance::getScope, engineMaintenanceQueryReq.getScope());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getEngineCode())) {
-//            queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenanceQueryReq.getEngineCode());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getIsActivate())) {
-//            queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenanceQueryReq.getIsActivate());
-//        }
-//
-//        if (StringUtils.isNotNull(engineMaintenanceQueryReq.getStatus())) {
-//            queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenanceQueryReq.getStatus());
-//        }
-//
-//        //分页
-//        Page<EngineMaintenance> page = new Page<>(engineMaintenanceQueryReq.getPageNum(), engineMaintenanceQueryReq.getPageSize());
         PageHelper.startPage(engineMaintenanceQueryReq.getPageNum(), engineMaintenanceQueryReq.getPageSize());
         List<EngineMaintenance> engineMaintenances = engineMapper.getMaintenanceList(engineMaintenanceQueryReq);
         PageInfo<EngineMaintenance> engineMaintenancePageInfo = new PageInfo<>(engineMaintenances);
         return Result.success(PageResult.toPageResult(engineMaintenancePageInfo.getTotal(), engineMaintenances));
     }
 
-
     @Override
     public Integer deletes(Long id) {
         Integer res = engineMapper.deletes(id);
@@ -197,10 +141,4 @@ public class EngIneServiceImpl extends ServiceImpl<EngineMapper, EngineMaintenan
         Integer res = engineMapper.forbiddenEngine(id);
         return Result.success(res);
     }
-
-//    @Override
-//    public List<EngineMaintenance> selectVersionById(Integer versionId) {
-//    List<EngineMaintenance> engineVersions =  engineMapper.selectVersionList(versionId);
-//        return engineVersions;
-//    }
 }

cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.domain.EngineMaintenance;
 import com.muyu.domain.EngineVersion;
 import com.muyu.domain.constants.ConfigCodeConstants;
 import com.muyu.domain.constants.RuleOperationConstants;
@@ -165,7 +166,8 @@ public class EngineVersionServiceImpl extends ServiceImpl<EngineVersionMapper, E
     }
 
     @Override
-    public EngineVersion getByIds(Long id) {
+    public Result<EngineMaintenance> getByIds(Long id) {
-        return null;
+        EngineMaintenance list = engineVersionMapper.getByIds(id);
+        return Result.success(list);
     }
 }

cloud-etl-server/src/main/resources/mapper/EngineMapper.xml

@@ -74,8 +74,4 @@
             </if>
         </where>
     </select>
-<!--    <select id="selectVersionList" resultType="com.muyu.domain.EngineMaintenance">-->
-<!--        select * from engine_maintenance left join engine_version on engine_maintenance.version_id = engine_version.id-->
-<!--        where version_id = #{versionId}-->
-<!--    </select>-->
 </mapper>

cloud-etl-server/src/main/resources/mapper/EngineVersionMapper.xml

@@ -11,4 +11,21 @@
                 #{engineMaintenanceId}, #{description}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime},
                 #{remark});
     </insert>
+    <select id="getByIds" resultType="com.muyu.domain.EngineMaintenance">
+        select id,
+                   name,
+            type,
+            scope,
+            engine_code,
+            is_activate,
+            status,
+            description,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            remark,
+            version_id
+        from engine_maintenance where  id = #{id}
+    </select>
 </mapper>