脚本更新

setup-project-manager-ui @ a84cc56d

-Subproject commit 14d1a991d85f5cdf7314a3377afaa4aabcb80ca1
+Subproject commit a84cc56da34785cfdc0685de536b7b133eb02c57

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectEntity.java

@@ -10,74 +10,78 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.setup.model.vo.SetupProjectVo;
 import lombok.Data;
 /**
-* 项目工程信息实体对象
-*
-* @author zxfei
-* @date 2024-10-21
-*/
+ * 项目工程信息实体对象
+ *
+ * @author zxfei
+ * @date 2024-10-24
+ */
 @Data
 public class SetupProjectEntity extends SetupProjectVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 项目产品名称
-    */
+     * 项目产品名称
+     */
     private String name;
     /**
-    * 项目产品编码
-    */
+     * 项目产品编码
+     */
     private String projectCode;
     /**
-    * 项目部署地址
-    */
+     * 项目部署地址
+     */
     private String projectPath;
     /**
-    * 项目shell地址
-    */
+     * 项目shell地址
+     */
     private String projectShell;
     /**
-    * 项目源文件地址，空则为内部包含
-    */
+     * 项目源文件地址，空则为内部包含
+     */
     private String sourceProject;
     /**
-    * 数据库host地址
-    */
+     * 数据库host地址
+     */
     private String dbHost;
     /**
-    * 数据库端口
-    */
+     * 数据库端口
+     */
     private String dbPort;
     /**
-    * 数据库用户
-    */
+     * 数据库用户
+     */
     private String dbUser;
     /**
-    * 数据库密码
-    */
+     * 数据库密码
+     */
     private String dbPassword;
     /**
-    * 数据库名称
-    */
+     * 数据库名称
+     */
     private String dbName;
     /**
-    * 项目版本
-    */
+     * 项目版本
+     */
     private String version;
     /**
-    * 项目类型(1.后端,2.前端,3.资源)
-    */
+     * 项目类型(1.后端,2.前端,3.资源)
+     */
     private Integer projectType;
     /**
-    * 项目状态(1.未部署,2.已部署,3.停止,4.运行)
-    */
+     * 项目状态(1.未部署,2.已部署,3.停止,4.运行)
+     */
     private Integer projectStatus;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 排序字段
+     */
+    private Long orderNum;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -85,26 +89,27 @@ public class SetupProjectEntity extends SetupProjectVo {
         if (obj instanceof SetupProjectEntity) {
             SetupProjectEntity tmp = (SetupProjectEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.name = "";
-            this.projectCode = "";
-            this.projectPath = "";
-            this.projectShell = "";
-            this.sourceProject = "";
-            this.dbHost = "127.0.0.1";
-            this.dbPort = "3306";
-            this.dbUser = "root";
-            this.dbPassword = "xhx@2022";
-            this.dbName = "";
-            this.version = "1.0";
-            this.projectType = 1;
-            this.projectStatus = 1;
-            this.remark = "";
+        this.name = "";
+        this.projectCode = "";
+        this.projectPath = "/home/publish/";
+        this.projectShell = "";
+        this.sourceProject = "";
+        this.dbHost = "127.0.0.1";
+        this.dbPort = "3306";
+        this.dbUser = "root";
+        this.dbPassword = "xhx@2022";
+        this.dbName = "";
+        this.version = "1.0";
+        this.projectType = 1;
+        this.projectStatus = 1;
+        this.remark = "";
+        this.orderNum = 0L;
     }
 }
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java

@@ -7,6 +7,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.ProjectStatusEnum;
 import com.mortals.xhx.common.code.ProjectTypeEnum;
@@ -26,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -58,6 +61,22 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(SetupProjectEntity query, Map<String, Object> model, Context context) throws AppException {
+        query.setSize(50);
+        query.setOrderColList(Arrays.asList(new OrderCol("orderNum")));
+
+
+        super.doListBefore(query, model, context);
+    }
+
+
+    @Override
+    protected void doListAfter(SetupProjectEntity query, List<SetupProjectEntity> list, Context context) throws AppException {
+        //todo 更新项目状态 通过shell cmd 命令等 查询项目状态
+
+        super.doListAfter(query, list, context);
+    }
 
     /**
      * 部署