ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,6 +6,7 @@ druid: # 主库数据源 master: # url: jdbc:mysql://112.98.126.2:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.1.162:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: 123 ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,8 @@ # 版权年份 copyrightYear: 2024 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） profile: D:/ruoyi/uploadPath # profile: D:/ruoyi/uploadPath profile: /home/wmm/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -16,7 +17,7 @@ # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 port: 8081 port: 6787 servlet: # 应用的访问路径 context-path: / @@ -69,6 +70,7 @@ redis: # 地址 host: 192.168.1.162 # host: 112.98.126.2 # 端口，默认为6379 port: 6379 # 数据库索引 ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration> <!-- 日志存放路径 --> <property name="log.path" value="/home/ruoyi/logs" /> <property name="log.path" value="/home/wmm/ruoyi/logs" /> <!-- 日志输出格式 --> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -4,7 +4,14 @@ 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.*; 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; @@ -18,7 +25,7 @@ * 航线Controller * * @author ruoyi * @date 2024-07-23 * @date 2024-07-31 */ @RestController @RequestMapping("/system/job") @@ -34,7 +41,7 @@ @GetMapping("/list") public TableDataInfo list(WaylineJob waylineJob) { startPage(); // startPage(); List<WaylineJob> list = waylineJobService.selectWaylineJobList(waylineJob); return getDataTable(list); } @@ -92,7 +99,6 @@ @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(waylineJobService.deleteWaylineJobByIds(ids)); } } } ruoyi-system/src/main/java/com/ruoyi/system/domain/WaylineJob.java
@@ -9,7 +9,7 @@ * 航线对象 wayline_job * * @author ruoyi * @date 2024-07-24 * @date 2024-07-31 */ public class WaylineJob extends BaseEntity { @@ -25,6 +25,10 @@ /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String name; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String jobIds; public void setId(Long id) { @@ -53,6 +57,15 @@ { return name; } public void setJobIds(String jobIds) { this.jobIds = jobIds; } public String getJobIds() { return jobIds; } @Override public String toString() { @@ -63,6 +76,7 @@ .append("updateTime", getUpdateTime()) .append("name", getName()) .append("remark", getRemark()) .append("jobIds", getJobIds()) .toString(); } } ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaylineJobMapper.java
@@ -7,7 +7,7 @@ * 航线Mapper接口 * * @author ruoyi * @date 2024-07-24 * @date 2024-07-31 */ public interface WaylineJobMapper { ruoyi-system/src/main/java/com/ruoyi/system/service/IWaylineJobService.java
@@ -7,7 +7,7 @@ * 航线Service接口 * * @author ruoyi * @date 2024-07-24 * @date 2024-07-31 */ public interface IWaylineJobService { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WaylineJobServiceImpl.java
@@ -12,7 +12,7 @@ * 航线Service业务层处理 * * @author ruoyi * @date 2024-07-24 * @date 2024-07-31 */ @Service public class WaylineJobServiceImpl implements IWaylineJobService ruoyi-system/src/main/resources/mapper/system/WaylineJobMapper.xml
@@ -11,10 +11,11 @@ <result property="updateTime" column="update_time" /> <result property="name" column="name" /> <result property="remark" column="remark" /> <result property="jobIds" column="job_ids" /> </resultMap> <sql id="selectWaylineJobVo"> select id, operations, create_time, update_time, name, remark from wayline_job select id, operations, create_time, update_time, name, remark, job_ids from wayline_job </sql> <select id="selectWaylineJobList" parameterType="WaylineJob" resultMap="WaylineJobResult"> @@ -22,6 +23,7 @@ <where> <if test="operations != null and operations != ''"> and operations = #{operations}</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="jobIds != null and jobIds != ''"> and job_ids = #{jobIds}</if> </where> </select> @@ -38,6 +40,7 @@ <if test="updateTime != null">update_time,</if> <if test="name != null">name,</if> <if test="remark != null">remark,</if> <if test="jobIds != null">job_ids,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="operations != null and operations != ''">#{operations},</if> @@ -45,6 +48,7 @@ <if test="updateTime != null">#{updateTime},</if> <if test="name != null">#{name},</if> <if test="remark != null">#{remark},</if> <if test="jobIds != null">#{jobIds},</if> </trim> </insert> @@ -56,6 +60,7 @@ <if test="updateTime != null">update_time = #{updateTime},</if> <if test="name != null">name = #{name},</if> <if test="remark != null">remark = #{remark},</if> <if test="jobIds != null">job_ids = #{jobIds},</if> </trim> where id = #{id} </update>
