feat:1.代码提交

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/controller/SleeperManagementController.java

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.deviceAsset.dto.SignBoardManagementDTO;
+import org.jeecg.modules.deviceAsset.dto.SleeperManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SignBoardManagement;
+import org.jeecg.modules.deviceAsset.entity.SleeperManagement;
+import org.jeecg.modules.deviceAsset.service.ISleeperManagementService;
+import org.jeecg.modules.deviceAsset.service.impl.SleeperManagementServiceImpl;
+import org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO;
+import org.jeecg.modules.deviceAsset.vo.SleeperManagementVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/sleeperManagement")
+@Api(tags = "资产管理-轨枕管理")
+public class SleeperManagementController extends JeecgController<SleeperManagement, ISleeperManagementService> {
+    @AutoLog(value = "资产管理-轨枕管理-分页列表查询")
+    @ApiOperation(value = "资产管理-道岔管理-分页列表查询", notes = "资产管理-道岔管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SleeperManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            SleeperManagementDTO dto) {
+        Page<SleeperManagementVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+
+    @AutoLog(value = "资产管理-轨枕管理-编辑")
+    @ApiOperation(value = "资产管理-轨枕管理-编辑", notes = "资产管理-轨枕管理-编辑")
+    @PostMapping(value = "/edit")
+    public Result<String> edit(@RequestBody SleeperManagement sleeperManagement) {
+        if (ObjectUtil.isEmpty(sleeperManagement.getId())) {
+            this.service.save(sleeperManagement);
+        } else {
+            this.service.updateById(sleeperManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "资产管理-轨枕管理-通过id删除")
+    @ApiOperation(value = "资产管理-轨枕管理-通过id删除", notes = "资产管理-轨枕管理-通过id删除")
+    @GetMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        this.service.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "资产管理-轨枕管理-批量删除")
+    @ApiOperation(value = "资产管理-轨枕管理-批量删除", notes = "资产管理-轨枕管理-批量删除")
+    @GetMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.service.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/SleeperManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Data
+@ApiModel(value = "SleeperManagementVO对象", description = "资产管理-轨枕管理")
+public class SleeperManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("轨枕编码")
+    private String sleeperCode;
+
+    @ApiModelProperty("道床id")
+    private String trackBedId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/entity/SleeperManagement.java

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_sleeper_management")
+@ApiModel(value = "SleeperManagement对象", description = "资产管理-轨枕管理")
+public class SleeperManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨枕编码")
+    @TableField("sleeper_code")
+    private String sleeperCode;
+
+    @ApiModelProperty("轨枕数量")
+    @TableField("sleeper_num")
+    private Integer sleeperNum;
+
+    @ApiModelProperty("轨枕类型")
+    @TableField("sleeper_type")
+    private String sleeperType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("道床id")
+    @TableField("track_bed_id")
+    private String trackBedId;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/SleeperManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.SleeperManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SleeperManagement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.deviceAsset.vo.SleeperManagementVO;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface SleeperManagementMapper extends BaseMapper<SleeperManagement> {
+
+    Page<SleeperManagementVO> queryPageList(Page<SleeperManagementVO> pageData, SleeperManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SleeperManagementMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.deviceAsset.mapper.SleeperManagementMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.SleeperManagementVO">
+        SELECT
+            t1.*,
+            t2.light_rail_name,
+            t2.light_rail_id,
+            t2.section_name,
+            ( SELECT line_alias_name FROM t_sn_line_alias WHERE id = t1.line_alias_id LIMIT 1 ) line_alias_name
+        FROM
+            t_da_sleeper_management t1
+            LEFT JOIN t_sn_subway_section t2 ON t1.section_id = t2.id
+            LEFT JOIN t_da_track_bed_management t3 ON t1.track_bed_id = t3.id
+        <where>
+            <if test="dto.sleeperCode != null and dto.sleeperCode != ''">
+                AND t1.sleeper_code like concat('%',#{dto.sleeperCode},'%')
+            </if>
+        </where>
+    </select>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SwitchManagementMapper.xml

@@ -18,6 +18,5 @@
             t_da_switch_management t1 LEFT JOIN t_sn_section_station_map t2 ON t1.section_station_map_id = t2.id
             LEFT JOIN t_sn_line_alias t3 ON t1.line_alias_id = t3.id
 
-
     </select>
 </mapper>
\ No newline at end of file

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/VerticalCurveManagementMapper.xml

@@ -13,8 +13,8 @@
             t_da_vertical_curve_management t1
             LEFT JOIN t_sn_subway_section t2 ON t1.section_id = t2.id
         <where>
-            <if test="dto.curveCode != null and dto.curveCode != ''">
-                AND t1.vertical_curve_code like concat('%',#{dto.curveCode},'%')
+            <if test="dto.verticalCurveCode != null and dto.verticalCurveCode != ''">
+                AND t1.vertical_curve_code like concat('%',#{dto.verticalCurveCode},'%')
             </if>
         </where>
     </select>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/service/ISleeperManagementService.java

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.SleeperManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SleeperManagement;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.vo.SleeperManagementVO;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface ISleeperManagementService extends IService<SleeperManagement> {
+
+    Page<SleeperManagementVO> queryPageList(Page<SleeperManagementVO> pageData, SleeperManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/service/impl/SleeperManagementServiceImpl.java

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.SleeperManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SleeperManagement;
+import org.jeecg.modules.deviceAsset.mapper.SleeperManagementMapper;
+import org.jeecg.modules.deviceAsset.service.ISleeperManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.deviceAsset.vo.SleeperManagementVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class SleeperManagementServiceImpl extends ServiceImpl<SleeperManagementMapper, SleeperManagement> implements ISleeperManagementService {
+
+    @Override
+    public Page<SleeperManagementVO> queryPageList(Page<SleeperManagementVO> pageData, SleeperManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/SleeperManagementVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 资产管理-轨枕管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Data
+@ApiModel(value = "SleeperManagement对象", description = "资产管理-轨枕管理")
+public class SleeperManagementVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("轨枕编码")
+    private String sleeperCode;
+
+    @ApiModelProperty("轨枕数量")
+    private Integer sleeperNum;
+
+    @ApiModelProperty("轨枕类型")
+    private String sleeperType;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("道床id")
+    private String trackBedId;
+
+}

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -23,14 +23,13 @@ public class CodeGenerate {
 
         // 输出目录
         String outputDir = projectPath + "\\jeecg-module-system\\jeecg-system-biz\\src\\main\\java\\";
-//        String outputDir = "F:\\workspace\\demo\\";
 
         // 模块名
         String moduleName = "deviceAsset";
 
         // 表名
         String[] tables = {
-                "t_da_vertical_curve_management",
+                "t_da_sleeper_management",
         };