From 23623888df0dd1444526818139e502b5f8015a51 Mon Sep 17 00:00:00 2001
From: wangmengmeng <764361881@qq.com>
Date: 星期四, 17 四月 2025 10:25:00 +0800
Subject: [PATCH] add wayline code
---
ruoyi-system/src/main/java/com/ruoyi/system/service/IWaylineJobService.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/domain/WaylineJob.java | 16 +++++++++++++++-
ruoyi-system/src/main/java/com/ruoyi/system/controller/WaylineJobController.java | 16 +++++++++++-----
ruoyi-admin/src/main/resources/application-druid.yml | 1 +
ruoyi-admin/src/main/resources/logback.xml | 2 +-
ruoyi-system/src/main/resources/mapper/system/WaylineJobMapper.xml | 7 ++++++-
ruoyi-admin/src/main/resources/application.yml | 6 ++++--
ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaylineJobMapper.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WaylineJobServiceImpl.java | 2 +-
9 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 4596402..30888fa 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/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
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b6ff297..56c4c8f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,8 @@
# 鐗堟潈骞翠唤
copyrightYear: 2024
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /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
# 鏁版嵁搴撶储寮�
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index a360583..486f0eb 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/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" />
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/WaylineJobController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WaylineJobController.java
index 7c0b0b8..464b6df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/WaylineJobController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WaylineJobController.java
@@ -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));
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WaylineJob.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WaylineJob.java
index 62c032d..787f601 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WaylineJob.java
+++ b/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();
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaylineJobMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaylineJobMapper.java
index f7a5663..a00161e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaylineJobMapper.java
+++ b/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
{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IWaylineJobService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IWaylineJobService.java
index 3936541..312fa13 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IWaylineJobService.java
+++ b/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
{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WaylineJobServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WaylineJobServiceImpl.java
index 3603a13..6967bad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WaylineJobServiceImpl.java
+++ b/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
diff --git a/ruoyi-system/src/main/resources/mapper/system/WaylineJobMapper.xml b/ruoyi-system/src/main/resources/mapper/system/WaylineJobMapper.xml
index 776e2e6..34698f2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/WaylineJobMapper.xml
+++ b/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>
--
Gitblit v1.9.3