area

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -16,15 +16,6 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("(♥◠‿◠)ﾉﾞ  启动铁路沿线综合治理信息化管理平台启动成功   ლ(´ڡ`ლ)ﾞ  \n");
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlAreaController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.qdtl;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.qdtl.domain.TlArea;
+import com.ruoyi.qdtl.service.ITlAreaService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 区域管理Controller
+ * 
+ * @author ruoyi
+ * @date 2022-02-21
+ */
+@RestController
+@RequestMapping("/qdtl/area")
+public class TlAreaController extends BaseController
+{
+    @Autowired
+    private ITlAreaService tlAreaService;
+
+    /**
+     * 查询区域管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TlArea tlArea)
+    {
+        startPage();
+        List<TlArea> list = tlAreaService.selectTlAreaList(tlArea);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出区域管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:export')")
+    @Log(title = "区域管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TlArea tlArea)
+    {
+        List<TlArea> list = tlAreaService.selectTlAreaList(tlArea);
+        ExcelUtil<TlArea> util = new ExcelUtil<TlArea>(TlArea.class);
+        util.exportExcel(response, list, "区域管理数据");
+    }
+
+    /**
+     * 获取区域管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tlAreaService.selectTlAreaById(id));
+    }
+
+    /**
+     * 新增区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:add')")
+    @Log(title = "区域管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TlArea tlArea)
+    {
+        return toAjax(tlAreaService.insertTlArea(tlArea));
+    }
+
+    /**
+     * 修改区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:edit')")
+    @Log(title = "区域管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TlArea tlArea)
+    {
+        return toAjax(tlAreaService.updateTlArea(tlArea));
+    }
+
+    /**
+     * 删除区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:area:remove')")
+    @Log(title = "区域管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tlAreaService.deleteTlAreaByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/banner.txt

@@ -1,24 +1,2 @@
 Application Version: ${ruoyi.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////
+Spring Boot Version: ${spring-boot.version}

ruoyi-admin/src/main/resources/logback.xml

@@ -18,7 +18,7 @@
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
             <maxFileSize>20MB</maxFileSize>
@@ -41,7 +41,7 @@
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
             <maxFileSize>20MB</maxFileSize>
@@ -64,7 +64,7 @@
 		<file>${log.path}/sys-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
             <maxFileSize>20MB</maxFileSize>

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlArea.java

@@ -0,0 +1,150 @@
+package com.ruoyi.qdtl.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 区域管理对象 tl_area
+ * 
+ * @author ruoyi
+ * @date 2022-02-21
+ */
+public class TlArea extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 父id */
+    private Long parentId;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String areaCode;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String areaName;
+
+    /** 区域类型 */
+    @Excel(name = "区域类型")
+    private String areaType;
+
+    /** 区域描述 */
+    @Excel(name = "区域描述")
+    private String detail;
+
+    /** 电子围栏 */
+    private String fence;
+
+    /** 经纬度 */
+    private String lnglat;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setAreaCode(String areaCode) 
+    {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaCode() 
+    {
+        return areaCode;
+    }
+    public void setAreaName(String areaName) 
+    {
+        this.areaName = areaName;
+    }
+
+    public String getAreaName() 
+    {
+        return areaName;
+    }
+    public void setAreaType(String areaType) 
+    {
+        this.areaType = areaType;
+    }
+
+    public String getAreaType() 
+    {
+        return areaType;
+    }
+    public void setDetail(String detail) 
+    {
+        this.detail = detail;
+    }
+
+    public String getDetail() 
+    {
+        return detail;
+    }
+    public void setFence(String fence) 
+    {
+        this.fence = fence;
+    }
+
+    public String getFence() 
+    {
+        return fence;
+    }
+    public void setLnglat(String lnglat) 
+    {
+        this.lnglat = lnglat;
+    }
+
+    public String getLnglat() 
+    {
+        return lnglat;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("parentId", getParentId())
+            .append("areaCode", getAreaCode())
+            .append("areaName", getAreaName())
+            .append("areaType", getAreaType())
+            .append("detail", getDetail())
+            .append("remark", getRemark())
+            .append("fence", getFence())
+            .append("lnglat", getLnglat())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/qdtl/mapper/TlAreaMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.qdtl.mapper;
+
+import java.util.List;
+import com.ruoyi.qdtl.domain.TlArea;
+
+/**
+ * 区域管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-02-21
+ */
+public interface TlAreaMapper 
+{
+    /**
+     * 查询区域管理
+     * 
+     * @param id 区域管理主键
+     * @return 区域管理
+     */
+    public TlArea selectTlAreaById(Long id);
+
+    /**
+     * 查询区域管理列表
+     * 
+     * @param tlArea 区域管理
+     * @return 区域管理集合
+     */
+    public List<TlArea> selectTlAreaList(TlArea tlArea);
+
+    /**
+     * 新增区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    public int insertTlArea(TlArea tlArea);
+
+    /**
+     * 修改区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    public int updateTlArea(TlArea tlArea);
+
+    /**
+     * 删除区域管理
+     * 
+     * @param id 区域管理主键
+     * @return 结果
+     */
+    public int deleteTlAreaById(Long id);
+
+    /**
+     * 批量删除区域管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTlAreaByIds(Long[] ids);
+
+    int selectExist(TlArea tlArea);
+}

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/ITlAreaService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.qdtl.service;
+
+import java.util.List;
+import com.ruoyi.qdtl.domain.TlArea;
+
+/**
+ * 区域管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-02-21
+ */
+public interface ITlAreaService 
+{
+    /**
+     * 查询区域管理
+     * 
+     * @param id 区域管理主键
+     * @return 区域管理
+     */
+    public TlArea selectTlAreaById(Long id);
+
+    /**
+     * 查询区域管理列表
+     * 
+     * @param tlArea 区域管理
+     * @return 区域管理集合
+     */
+    public List<TlArea> selectTlAreaList(TlArea tlArea);
+
+    /**
+     * 新增区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    public int insertTlArea(TlArea tlArea);
+
+    /**
+     * 修改区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    public int updateTlArea(TlArea tlArea);
+
+    /**
+     * 批量删除区域管理
+     * 
+     * @param ids 需要删除的区域管理主键集合
+     * @return 结果
+     */
+    public int deleteTlAreaByIds(Long[] ids);
+
+    /**
+     * 删除区域管理信息
+     * 
+     * @param id 区域管理主键
+     * @return 结果
+     */
+    public int deleteTlAreaById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlAreaServiceImpl.java

@@ -0,0 +1,125 @@
+package com.ruoyi.qdtl.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.qdtl.mapper.TlAreaMapper;
+import com.ruoyi.qdtl.domain.TlArea;
+import com.ruoyi.qdtl.service.ITlAreaService;
+
+/**
+ * 区域管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-02-21
+ */
+@Service
+public class TlAreaServiceImpl implements ITlAreaService 
+{
+    @Autowired
+    private TlAreaMapper tlAreaMapper;
+
+    /**
+     * 查询区域管理
+     * 
+     * @param id 区域管理主键
+     * @return 区域管理
+     */
+    @Override
+    public TlArea selectTlAreaById(Long id)
+    {
+        return tlAreaMapper.selectTlAreaById(id);
+    }
+
+    /**
+     * 查询区域管理列表
+     * 
+     * @param tlArea 区域管理
+     * @return 区域管理
+     */
+    @Override
+    public List<TlArea> selectTlAreaList(TlArea tlArea)
+    {
+        return tlAreaMapper.selectTlAreaList(tlArea);
+    }
+
+    /**
+     * 新增区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    @Override
+    public int insertTlArea(TlArea tlArea)
+    {
+        tlArea.setCreateTime(DateUtils.getNowDate());
+        // 控制编号和名称不能重复
+        int count = tlAreaMapper.selectExist(tlArea);
+        if (count > 0) {
+            throw new ServiceException("编号或名称已存在，请更换");
+        }
+        return tlAreaMapper.insertTlArea(tlArea);
+    }
+
+    /**
+     * 修改区域管理
+     * 
+     * @param tlArea 区域管理
+     * @return 结果
+     */
+    @Override
+    public int updateTlArea(TlArea tlArea)
+    {
+        tlArea.setUpdateTime(DateUtils.getNowDate());
+        // 查询原有的数据
+        TlArea old = selectTlAreaById(tlArea.getId());
+        if (old != null) {
+            if (!old.getAreaCode().equals(tlArea.getAreaCode())) {
+                // 校验是否重复
+                TlArea check = new TlArea();
+                check.setAreaCode(tlArea.getAreaCode());
+                List<TlArea> tlAreas = tlAreaMapper.selectTlAreaList(check);
+                if (tlAreas.size() > 0) {
+                    throw new ServiceException("编号已存在，请更换");
+                }
+            }
+            if (!old.getAreaName().equals(tlArea.getAreaName())) {
+                // 校验是否重复
+                TlArea check = new TlArea();
+                check.setAreaName(tlArea.getAreaName());
+                List<TlArea> tlAreas = tlAreaMapper.selectTlAreaList(check);
+                if (tlAreas.size() > 0) {
+                    throw new ServiceException("名称已存在，请更换");
+                }
+            }
+        }
+        return tlAreaMapper.updateTlArea(tlArea);
+    }
+
+    /**
+     * 批量删除区域管理
+     * 
+     * @param ids 需要删除的区域管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTlAreaByIds(Long[] ids)
+    {
+        return tlAreaMapper.deleteTlAreaByIds(ids);
+    }
+
+    /**
+     * 删除区域管理信息
+     * 
+     * @param id 区域管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTlAreaById(Long id)
+    {
+        return tlAreaMapper.deleteTlAreaById(id);
+    }
+}

ruoyi-system/src/main/resources/mapper/qdtl/TlAreaMapper.xml

@@ -0,0 +1,115 @@
+<?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="com.ruoyi.qdtl.mapper.TlAreaMapper">
+    
+    <resultMap type="TlArea" id="TlAreaResult">
+        <result property="id"    column="id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="areaType"    column="area_type"    />
+        <result property="detail"    column="detail"    />
+        <result property="remark"    column="remark"    />
+        <result property="fence"    column="fence"    />
+        <result property="lnglat"    column="lnglat"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTlAreaVo">
+        select id, parent_id, area_code, area_name, area_type, detail, remark, fence, lnglat, del_flag, create_by, create_time, update_by, update_time from tl_area
+    </sql>
+
+    <select id="selectTlAreaList" parameterType="TlArea" resultMap="TlAreaResult">
+        <include refid="selectTlAreaVo"/>
+        <where>  
+            <if test="areaCode != null  and areaCode != ''"> and area_code like concat('%', #{areaCode}, '%')</if>
+            <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
+            <if test="areaType != null  and areaType != ''"> and area_type = #{areaType}</if>
+             and del_flag = '0'
+        </where>
+    </select>
+    
+    <select id="selectTlAreaById" parameterType="Long" resultMap="TlAreaResult">
+        <include refid="selectTlAreaVo"/>
+        where id = #{id}
+        and del_flag = '0'
+    </select>
+
+    <select id="selectExist" resultType="java.lang.Integer">
+        select count(1) from tl_area
+        where (area_code = #{areaCode}
+            or area_name = #{areaName})
+            and del_flag = '0'
+    </select>
+
+    <insert id="insertTlArea" parameterType="TlArea" useGeneratedKeys="true" keyProperty="id">
+        insert into tl_area
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">parent_id,</if>
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
+            <if test="areaName != null and areaName != ''">area_name,</if>
+            <if test="areaType != null and areaType != ''">area_type,</if>
+            <if test="detail != null">detail,</if>
+            <if test="remark != null">remark,</if>
+            <if test="fence != null">fence,</if>
+            <if test="lnglat != null">lnglat,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">#{parentId},</if>
+            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
+            <if test="areaName != null and areaName != ''">#{areaName},</if>
+            <if test="areaType != null and areaType != ''">#{areaType},</if>
+            <if test="detail != null">#{detail},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="fence != null">#{fence},</if>
+            <if test="lnglat != null">#{lnglat},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTlArea" parameterType="TlArea">
+        update tl_area
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
+            <if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
+            <if test="areaType != null and areaType != ''">area_type = #{areaType},</if>
+            <if test="detail != null">detail = #{detail},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="fence != null">fence = #{fence},</if>
+            <if test="lnglat != null">lnglat = #{lnglat},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTlAreaById" parameterType="Long">
+        delete from tl_area where id = #{id}
+    </delete>
+
+    <delete id="deleteTlAreaByIds" parameterType="String">
+        delete from tl_area where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>