From 3de9a70c67bd2949e0582a9b5345324d095d237b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 十二月 2024 19:36:20 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java | 2
se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java | 183 +++++++++++++++++++++++-------------
se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java | 2
se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java | 6
说明.txt | 4
docker-compose/mysql/initdb/se_cloud_20241204.sql | 9 +
se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml | 27 ++++-
se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java | 49 +++++++++
8 files changed, 199 insertions(+), 83 deletions(-)
diff --git a/docker-compose/mysql/initdb/se_cloud_20241204.sql b/docker-compose/mysql/initdb/se_cloud_20241204.sql
index 8546476..d3ef59b 100644
--- a/docker-compose/mysql/initdb/se_cloud_20241204.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20241204.sql
@@ -13,12 +13,15 @@
drop table if exists sys_task_ctrl;
create table sys_task_ctrl (
task_id bigint(20) not null auto_increment comment '浠诲姟ID',
- prj_id varchar(50) comment '浠诲姟ID',
- prj_name varchar(200) comment '浠诲姟鍚嶇О',
+ task_name varchar(200) comment '浠诲姟鍚嶇О',
+ prj_id varchar(50) comment '鏂规ID',
+ prj_name varchar(200) comment '鏂规鍚嶇О',
think_id varchar(50) comment '鎯冲畾ID',
think_name varchar(200) comment '鎯冲畾鍚嶇О',
+ begin_time varchar(50) comment '寮�濮嬫椂闂�',
+ end_time varchar(50) comment '缁撴潫鏃堕棿',
+ calc_node varchar(2000) comment '璁＄畻鑺傜偣',
is_save char(1) default 0 comment '鏄惁淇濆瓨锛�0姝ｅ父 1鍋滅敤锛�',
- node varchar(2000) comment '鑺傜偣',
status char(1) default 0 comment '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�',
create_by varchar(64) default '' comment '鍒涘缓鑰�',
create_time datetime comment '鍒涘缓鏃堕棿',
diff --git a/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java b/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java
index b5bfd93..d97cab8 100644
--- a/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java
+++ b/se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java
@@ -1,8 +1,8 @@
package com.se.docker.service;
import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.model.PullResponseItem;
import com.github.dockerjava.core.DockerClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,4 +51,49 @@
log.error(ex.getMessage(), ex);
}
}
+
+ public void s() throws Exception {
+ // 鑾峰彇榛樿鐨� Docker Client
+ DockerClient dockerClient = DockerClientBuilder.getInstance().build();
+
+ // 鎷夊彇闀滃儚
+ String image = "openjdk:8-alpine";
+ PullImageCmd pullImageCmd = dockerClient.pullImageCmd(image);
+ PullImageResultCallback pullImageResultCallback = new PullImageResultCallback() {
+ @Override
+ public void onNext(PullResponseItem item) {
+ System.out.println("涓嬭浇闀滃儚锛�" + item.getStatus());
+ super.onNext(item);
+ }
+ };
+ pullImageCmd
+ .exec(pullImageResultCallback)
+ .awaitCompletion();
+ System.out.println("涓嬭浇瀹屾垚");
+
+ // 鍒涘缓瀹瑰櫒
+ CreateContainerCmd containerCmd = dockerClient.createContainerCmd(image);
+ CreateContainerResponse createContainerResponse = containerCmd
+ .withCmd("echo", "Hello Docker")
+ .exec();
+ System.out.println(createContainerResponse);
+
+ // 鍚姩瀹瑰櫒
+ String containerId = "";
+ dockerClient.startContainerCmd(containerId).exec();
+
+ // 鏋勫缓鍋滄瀹瑰櫒鐨勫懡浠�
+ StopContainerCmd stopContainerCmd = dockerClient.stopContainerCmd(containerId);
+ // 鎵ц鍛戒护
+ stopContainerCmd.exec();
+
+ // 鍒犻櫎瀹瑰櫒
+ dockerClient.removeContainerCmd(containerId).withForce(true).exec();
+
+ // 鍒犻櫎闀滃儚
+ dockerClient.removeImageCmd(image).exec();
+
+ // 閲嶅惎瀹瑰櫒
+ dockerClient.restartContainerCmd(containerId).exec();
+ }
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java b/se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java
index efb5015..f621a2c 100644
--- a/se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java
@@ -9,132 +9,183 @@
* 鍒嗙郴缁熶换鍔℃帶鍒跺璞� sys_task_ctrl
*
* @author se
- * @date 2024-12-07
+ * @date 2024-12-09
*/
-public class SysTaskCtrl extends BaseEntity
-{
+public class SysTaskCtrl extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 浠诲姟ID */
+ /**
+ * 浠诲姟ID
+ */
private Long taskId;
- /** 浠诲姟ID */
- @Excel(name = "浠诲姟ID")
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ @Excel(name = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ /**
+ * 鏂规ID
+ */
+ @Excel(name = "鏂规ID")
private String prjId;
- /** 浠诲姟鍚嶇О */
- @Excel(name = "浠诲姟鍚嶇О")
+ /**
+ * 鏂规鍚嶇О
+ */
+ @Excel(name = "鏂规鍚嶇О")
private String prjName;
- /** 鎯冲畾ID */
+ /**
+ * 鎯冲畾ID
+ */
@Excel(name = "鎯冲畾ID")
private String thinkId;
- /** 鎯冲畾鍚嶇О */
+ /**
+ * 鎯冲畾鍚嶇О
+ */
@Excel(name = "鎯冲畾鍚嶇О")
private String thinkName;
- /** 鏄惁淇濆瓨锛�0姝ｅ父 1鍋滅敤锛� */
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @Excel(name = "寮�濮嬫椂闂�")
+ private String beginTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @Excel(name = "缁撴潫鏃堕棿")
+ private String endTime;
+
+ /**
+ * 璁＄畻鑺傜偣
+ */
+ @Excel(name = "璁＄畻鑺傜偣")
+ private String calcNode;
+
+ /**
+ * 鏄惁淇濆瓨锛�0姝ｅ父 1鍋滅敤锛�
+ */
@Excel(name = "鏄惁淇濆瓨", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String isSave;
- /** 鑺傜偣 */
- @Excel(name = "鑺傜偣")
- private String node;
-
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
@Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
- public void setTaskId(Long taskId)
- {
+ public void setTaskId(Long taskId) {
this.taskId = taskId;
}
- public Long getTaskId()
- {
+ public Long getTaskId() {
return taskId;
}
- public void setPrjId(String prjId)
- {
+
+ public void setTaskName(String taskName) {
+ this.taskName = taskName;
+ }
+
+ public String getTaskName() {
+ return taskName;
+ }
+
+ public void setPrjId(String prjId) {
this.prjId = prjId;
}
- public String getPrjId()
- {
+ public String getPrjId() {
return prjId;
}
- public void setPrjName(String prjName)
- {
+
+ public void setPrjName(String prjName) {
this.prjName = prjName;
}
- public String getPrjName()
- {
+ public String getPrjName() {
return prjName;
}
- public void setThinkId(String thinkId)
- {
+
+ public void setThinkId(String thinkId) {
this.thinkId = thinkId;
}
- public String getThinkId()
- {
+ public String getThinkId() {
return thinkId;
}
- public void setThinkName(String thinkName)
- {
+
+ public void setThinkName(String thinkName) {
this.thinkName = thinkName;
}
- public String getThinkName()
- {
+ public String getThinkName() {
return thinkName;
}
- public void setIsSave(String isSave)
- {
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setCalcNode(String calcNode) {
+ this.calcNode = calcNode;
+ }
+
+ public String getCalcNode() {
+ return calcNode;
+ }
+
+ public void setIsSave(String isSave) {
this.isSave = isSave;
}
- public String getIsSave()
- {
+ public String getIsSave() {
return isSave;
}
- public void setNode(String node)
- {
- this.node = node;
- }
- public String getNode()
- {
- return node;
- }
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
this.status = status;
}
- public String getStatus()
- {
+ public String getStatus() {
return status;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("taskId", getTaskId())
- .append("prjId", getPrjId())
- .append("prjName", getPrjName())
- .append("thinkId", getThinkId())
- .append("thinkName", getThinkName())
- .append("isSave", getIsSave())
- .append("node", getNode())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ .append("taskId", getTaskId())
+ .append("taskName", getTaskName())
+ .append("prjId", getPrjId())
+ .append("prjName", getPrjName())
+ .append("thinkId", getThinkId())
+ .append("thinkName", getThinkName())
+ .append("beginTime", getBeginTime())
+ .append("endTime", getEndTime())
+ .append("calcNode", getCalcNode())
+ .append("isSave", getIsSave())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java b/se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java
index fe8f5bf..84472a2 100644
--- a/se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java
+++ b/se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java
@@ -7,7 +7,7 @@
* 鍒嗙郴缁熶换鍔℃帶鍒禡apper鎺ュ彛
*
* @author se
- * @date 2024-12-07
+ * @date 2024-12-09
*/
public interface SysTaskCtrlMapper
{
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java
index 4f04515..da2a403 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java
@@ -2,10 +2,10 @@
import java.util.List;
import com.se.common.core.utils.DateUtils;
+import com.se.system.service.inte.ISysTaskCtrlService;
import org.springframework.stereotype.Service;
import com.se.system.mapper.SysTaskCtrlMapper;
import com.se.system.domain.SysTaskCtrl;
-import com.se.system.service.inte.ISysTaskCtrlService;
import javax.annotation.Resource;
@@ -13,10 +13,10 @@
* 鍒嗙郴缁熶换鍔℃帶鍒禨ervice涓氬姟灞傚鐞�
*
* @author se
- * @date 2024-12-07
+ * @date 2024-12-09
*/
@Service
-public class SysTaskCtrlServiceImpl implements ISysTaskCtrlService
+public class SysTaskCtrlServiceImpl implements ISysTaskCtrlService
{
@Resource
private SysTaskCtrlMapper sysTaskCtrlMapper;
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java
index 528fe5d..7a78812 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java
@@ -7,7 +7,7 @@
* 鍒嗙郴缁熶换鍔℃帶鍒禨ervice鎺ュ彛
*
* @author se
- * @date 2024-12-07
+ * @date 2024-12-09
*/
public interface ISysTaskCtrlService
{
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml
index 5b68f55..ad1a4d5 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml
@@ -6,12 +6,15 @@
<resultMap type="SysTaskCtrl" id="SysTaskCtrlResult">
<result property="taskId" column="task_id" />
+ <result property="taskName" column="task_name" />
<result property="prjId" column="prj_id" />
<result property="prjName" column="prj_name" />
<result property="thinkId" column="think_id" />
<result property="thinkName" column="think_name" />
+ <result property="beginTime" column="begin_time" />
+ <result property="endTime" column="end_time" />
+ <result property="calcNode" column="calc_node" />
<result property="isSave" column="is_save" />
- <result property="node" column="node" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -21,18 +24,21 @@
</resultMap>
<sql id="selectSysTaskCtrlVo">
- select task_id, prj_id, prj_name, think_id, think_name, is_save, node, status, create_by, create_time, update_by, update_time, remark from sys_task_ctrl
+ select task_id, task_name, prj_id, prj_name, think_id, think_name, begin_time, end_time, calc_node, is_save, status, create_by, create_time, update_by, update_time, remark from sys_task_ctrl
</sql>
<select id="selectSysTaskCtrlList" parameterType="SysTaskCtrl" resultMap="SysTaskCtrlResult">
<include refid="selectSysTaskCtrlVo"/>
<where>
+ <if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
<if test="prjId != null and prjId != ''"> and prj_id = #{prjId}</if>
<if test="prjName != null and prjName != ''"> and prj_name like concat('%', #{prjName}, '%')</if>
<if test="thinkId != null and thinkId != ''"> and think_id = #{thinkId}</if>
<if test="thinkName != null and thinkName != ''"> and think_name like concat('%', #{thinkName}, '%')</if>
+ <if test="beginTime != null and beginTime != ''"> and begin_time = #{beginTime}</if>
+ <if test="endTime != null and endTime != ''"> and end_time = #{endTime}</if>
+ <if test="calcNode != null and calcNode != ''"> and calc_node = #{calcNode}</if>
<if test="isSave != null and isSave != ''"> and is_save = #{isSave}</if>
- <if test="node != null and node != ''"> and node = #{node}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
</where>
</select>
@@ -45,12 +51,15 @@
<insert id="insertSysTaskCtrl" parameterType="SysTaskCtrl" useGeneratedKeys="true" keyProperty="taskId">
insert into sys_task_ctrl
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="taskName != null">task_name,</if>
<if test="prjId != null">prj_id,</if>
<if test="prjName != null">prj_name,</if>
<if test="thinkId != null">think_id,</if>
<if test="thinkName != null">think_name,</if>
+ <if test="beginTime != null">begin_time,</if>
+ <if test="endTime != null">end_time,</if>
+ <if test="calcNode != null">calc_node,</if>
<if test="isSave != null">is_save,</if>
- <if test="node != null">node,</if>
<if test="status != null">status,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -59,12 +68,15 @@
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="taskName != null">#{taskName},</if>
<if test="prjId != null">#{prjId},</if>
<if test="prjName != null">#{prjName},</if>
<if test="thinkId != null">#{thinkId},</if>
<if test="thinkName != null">#{thinkName},</if>
+ <if test="beginTime != null">#{beginTime},</if>
+ <if test="endTime != null">#{endTime},</if>
+ <if test="calcNode != null">#{calcNode},</if>
<if test="isSave != null">#{isSave},</if>
- <if test="node != null">#{node},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -77,12 +89,15 @@
<update id="updateSysTaskCtrl" parameterType="SysTaskCtrl">
update sys_task_ctrl
<trim prefix="SET" suffixOverrides=",">
+ <if test="taskName != null">task_name = #{taskName},</if>
<if test="prjId != null">prj_id = #{prjId},</if>
<if test="prjName != null">prj_name = #{prjName},</if>
<if test="thinkId != null">think_id = #{thinkId},</if>
<if test="thinkName != null">think_name = #{thinkName},</if>
+ <if test="beginTime != null">begin_time = #{beginTime},</if>
+ <if test="endTime != null">end_time = #{endTime},</if>
+ <if test="calcNode != null">calc_node = #{calcNode},</if>
<if test="isSave != null">is_save = #{isSave},</if>
- <if test="node != null">node = #{node},</if>
<if test="status != null">status = #{status},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 5449bef..b539816 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -64,7 +64,9 @@
# 涓嶆牎楠岀櫧鍚嶅崟
ignore:
whites:
- - /system/index/*
+# - /system/index/*
+ - /system/reg/*
+ - /system/taskCtrl/*
--------------------------------------------------------
se-system-dev.yml锛屾坊鍔狅細
--
Gitblit v1.9.3