From 8019eb2a10d91ad157053f3e5bd6a761aca34f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 24 Sep 2024 16:30:17 +0800
Subject: [PATCH] 'commit'

---
 .../Base/Controller/BaseController.java       | 23 +++++++++++++++++++
 .../resource/Base/Model/BaseModel.java        | 16 +++++++++++++
 .../com/dsideal/resource/ResApplication.java  |  3 +++
 dsRes/src/main/resource/Start.sh              | 19 +++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
 create mode 100644 dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
 create mode 100644 dsRes/src/main/resource/Start.sh

diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
new file mode 100644
index 00000000..d57d9c45
--- /dev/null
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
@@ -0,0 +1,23 @@
+package com.dsideal.resource.Base.Controller;
+
+import com.dsideal.resource.Base.Model.BaseModel;
+import com.jfinal.core.Controller;
+import com.jfinal.kit.Kv;
+import com.jfinal.plugin.activerecord.Record;
+
+import java.util.List;
+
+public class BaseController extends Controller {
+    BaseModel bm = new BaseModel();
+
+    /**
+     * 功能：获取学段列表
+     */
+    public void getStageList() {
+        List<Record> list = bm.getStageList();
+        Kv kv = Kv.create();
+        kv.set("success", true);
+        kv.set("data", list);
+        renderJson(kv);
+    }
+}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
new file mode 100644
index 00000000..6e58c750
--- /dev/null
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
@@ -0,0 +1,16 @@
+package com.dsideal.resource.Base.Model;
+
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import java.util.List;
+
+public class BaseModel {
+    /**
+     * 功能：获取学段列表
+     * @return
+     */
+    public List<Record> getStageList(){
+        String sql="select * from t_dm_stage order by stage_id";
+        return Db.find(sql);
+    }
+}
diff --git a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java
index e912e40b..f2ec1bdc 100644
--- a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java
+++ b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java
@@ -1,5 +1,6 @@
 package com.dsideal.resource;
 
+import com.dsideal.resource.Base.Controller.BaseController;
 import com.dsideal.resource.Index.IndexController;
 import com.dsideal.resource.Interceptor.*;
 import com.dsideal.resource.Menu.Controller.MenuController;
@@ -60,6 +61,8 @@ public class ResApplication extends JFinalConfig {
         me.add("/", IndexController.class);
         //菜单
         me.add("/menu", MenuController.class);
+        //资源基础管理
+        me.add("/base", BaseController.class);
     }
 
     @Override
diff --git a/dsRes/src/main/resource/Start.sh b/dsRes/src/main/resource/Start.sh
new file mode 100644
index 00000000..25b5b05d
--- /dev/null
+++ b/dsRes/src/main/resource/Start.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# 容器名称
+CONTAINER_NAME=dsRes
+
+# 登录镜像仓库
+docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com --password DsideaL4r5t6y7u
+# 镜像名称
+IMAGE_NAME=registry.cn-hangzhou.aliyuncs.com/dsideal/ds_base:dev_20240924140624
+
+# 删除容器
+docker rm -f ${CONTAINER_NAME}
+
+# 运行容器
+docker run -d  --network=host --name "${CONTAINER_NAME}" \
+--privileged=true  --env WORKING_ENV=dev  -w /home -p 8002:8002 -v "$PWD/logs:/home/logs" --restart=always "${IMAGE_NAME}"
+
+# 查看日志
+docker logs -f --tail 500 "${CONTAINER_NAME}"