1
13693261870
2024-12-09 3de9a70c67bd2949e0582a9b5345324d095d237b
1
已修改8个文件
282 ■■■■ 文件已修改
docker-compose/mysql/initdb/se_cloud_20241204.sql 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-docker/src/main/java/com/se/docker/service/SysDockerService.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-system/src/main/java/com/se/system/domain/SysTaskCtrl.java 183 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-system/src/main/java/com/se/system/service/impl/SysTaskCtrlServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-modules/se-system/src/main/resources/mapper/system/SysTaskCtrlMapper.xml 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
说明.txt 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 '创建时间',
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();
    }
}
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();
    }
}
se-modules/se-system/src/main/java/com/se/system/mapper/SysTaskCtrlMapper.java
@@ -7,7 +7,7 @@
 * åˆ†ç³»ç»Ÿä»»åŠ¡æŽ§åˆ¶Mapper接口
 * 
 * @author se
 * @date 2024-12-07
 * @date 2024-12-09
 */
public interface SysTaskCtrlMapper 
{
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 @@
 * åˆ†ç³»ç»Ÿä»»åŠ¡æŽ§åˆ¶Service业务层处理
 * 
 * @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;
se-modules/se-system/src/main/java/com/se/system/service/inte/ISysTaskCtrlService.java
@@ -7,7 +7,7 @@
 * åˆ†ç³»ç»Ÿä»»åŠ¡æŽ§åˆ¶Service接口
 * 
 * @author se
 * @date 2024-12-07
 * @date 2024-12-09
 */
public interface ISysTaskCtrlService 
{
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>
˵Ã÷.txt
@@ -64,7 +64,9 @@
  # ä¸æ ¡éªŒç™½åå•
  ignore:
    whites:
      - /system/index/*
#     - /system/index/*
      - /system/reg/*
      - /system/taskCtrl/*
--------------------------------------------------------
se-system-dev.yml,添加: