Commit 7c2ea4d6 authored by 赵啸非's avatar 赵啸非

脚本更新

parent 5041f9f2
Subproject commit 14d1a991d85f5cdf7314a3377afaa4aabcb80ca1 Subproject commit a84cc56da34785cfdc0685de536b7b133eb02c57
...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.setup.model.vo.SetupProjectVo; import com.mortals.xhx.module.setup.model.vo.SetupProjectVo;
import lombok.Data; import lombok.Data;
/** /**
* 项目工程信息实体对象 * 项目工程信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-10-21 * @date 2024-10-24
*/ */
@Data @Data
public class SetupProjectEntity extends SetupProjectVo { public class SetupProjectEntity extends SetupProjectVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -75,6 +75,10 @@ public class SetupProjectEntity extends SetupProjectVo { ...@@ -75,6 +75,10 @@ public class SetupProjectEntity extends SetupProjectVo {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 排序字段
*/
private Long orderNum;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -94,7 +98,7 @@ public class SetupProjectEntity extends SetupProjectVo { ...@@ -94,7 +98,7 @@ public class SetupProjectEntity extends SetupProjectVo {
public void initAttrValue(){ public void initAttrValue(){
this.name = ""; this.name = "";
this.projectCode = ""; this.projectCode = "";
this.projectPath = ""; this.projectPath = "/home/publish/";
this.projectShell = ""; this.projectShell = "";
this.sourceProject = ""; this.sourceProject = "";
this.dbHost = "127.0.0.1"; this.dbHost = "127.0.0.1";
...@@ -106,5 +110,6 @@ public class SetupProjectEntity extends SetupProjectVo { ...@@ -106,5 +110,6 @@ public class SetupProjectEntity extends SetupProjectVo {
this.projectType = 1; this.projectType = 1;
this.projectStatus = 1; this.projectStatus = 1;
this.remark = ""; this.remark = "";
this.orderNum = 0L;
} }
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ import com.mortals.framework.annotation.UnAuth; ...@@ -7,6 +7,7 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.ProjectStatusEnum; import com.mortals.xhx.common.code.ProjectStatusEnum;
import com.mortals.xhx.common.code.ProjectTypeEnum; import com.mortals.xhx.common.code.ProjectTypeEnum;
...@@ -26,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -26,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -58,6 +61,22 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se ...@@ -58,6 +61,22 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
super.init(model, context); 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);
}
/** /**
* 部署 * 部署
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment