scottpan/msh-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update pom.xml Lombok config and deploy settings

Browse Source 
- Update Maven compiler plugin to support Lombok annotation processing
- Add deploy.conf for automated deployment
- Update backend models and controllers
- Update frontend pages and API
This commit is contained in:
scottpan
2026-03-04 12:21:29 +08:00
parent 4646fbc9b5
commit 6f2dc27fbc
20 changed files with 352 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/article/Article.java
View File

@@ -1,6 +1,7 @@
package com.zbkj.common.model.article;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -55,6 +56,14 @@ public class Article implements Serializable {
@ApiModelProperty(value = "浏览次数")
private String visit;
@ApiModelProperty(value = "页面浏览量（表中暂无该列，仅内存使用）")
@TableField(exist = false)
private Integer pageViews;
@ApiModelProperty(value = "收藏数（表中暂无该列，仅内存使用）")
@TableField(exist = false)
private Integer collect;
@ApiModelProperty(value = "排序")
private Integer sort;
@@ -141,4 +150,36 @@ public class Article implements Serializable {
@ApiModelProperty(value = "关联的打卡记录ID")
private Integer checkInRecordId;
public Integer getId() {
return id;
}
public Date getCreateTime() {
return createTime;
}
public String getCid() {
return cid;
}
public Boolean getHide() {
return hide;
}
public Boolean getStatus() {
return status;
}
public String getVisit() {
return visit;
}
public Integer getPageViews() {
return pageViews;
}
public Integer getCollect() {
return collect;
}
}

8
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemAdmin.java
View File

@@ -69,4 +69,12 @@ public class SystemAdmin implements Serializable {
@ApiModelProperty(value = "是否接收短信")
private Boolean isSms;
public Integer getId() {
return id;
}
public String getRealName() {
return realName;
}
}

19
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemConfig.java
View File

@@ -8,7 +8,6 @@ import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -18,7 +17,6 @@ import lombok.experimental.Accessors;
* | Author:ScottPan
* +----------------------------------------------------------------------
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("eb_system_config")
@@ -51,4 +49,21 @@ public class SystemConfig implements Serializable {
@ApiModelProperty(value = "更新时间")
private Date updateTime;
public Integer getId() { return id; }
public void setId(Integer id) { this.id = id; }
public String getName() { return name; }
public void setName(String name) { this.name = name; }
public String getTitle() { return title; }
public void setTitle(String title) { this.title = title; }
public Integer getFormId() { return formId; }
public void setFormId(Integer formId) { this.formId = formId; }
public String getValue() { return value; }
public void setValue(String value) { this.value = value; }
public Boolean getStatus() { return status; }
public void setStatus(Boolean status) { this.status = status; }
public Date getCreateTime() { return createTime; }
public void setCreateTime(Date createTime) { this.createTime = createTime; }
public Date getUpdateTime() { return updateTime; }
public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
}

47
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemMenu.java
View File

@@ -66,5 +66,52 @@ public class SystemMenu implements Serializable {
@JsonIgnore
private Date updateTime;
public Integer getId() {
return id;
}
public Integer getPid() {
return pid;
}
public String getName() {
return name;
}
public String getIcon() {
return icon;
}
public String getPerms() {
return perms;
}
public String getComponent() {
return component;
}
public String getMenuType() {
return menuType;
}
public Integer getSort() {
return sort;
}
public Boolean getIsShow() {
return isShow;
}
public Boolean getIsDelte() {
return isDelte;
}
public Date getCreateTime() {
return createTime;
}
public Date getUpdateTime() {
return updateTime;
}
}

3
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemPermissions.java
View File

@@ -47,5 +47,8 @@ public class SystemPermissions implements Serializable {
@ApiModelProperty(value = "是否删除")
private Boolean isDelte;
public String getPath() {
return path;
}
}

4
msh_crmeb_22/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
View File

@@ -150,4 +150,8 @@ public class User implements Serializable {
@ApiModelProperty(value = "成为分销员时间")
private Date promoterTime;
public Integer getUid() {
return uid;
}
}

20
msh_crmeb_22/crmeb-front/src/main/java/com/zbkj/front/controller/ToolController.java
View File

@@ -358,7 +358,15 @@ public class ToolController {
@ApiOperation(value = "点赞/取消点赞")
@PostMapping("/community/like")
public CommonResult<String> toggleLike(@RequestBody Map<String, Object> data) {
toolCommunityService.toggleLike((Long) data.get("postId"), (Boolean) data.get("isLike"));
Object postIdObj = data.get("postId");
Long postId = postIdObj instanceof Number
? ((Number) postIdObj).longValue()
: (postIdObj != null ? Long.parseLong(postIdObj.toString()) : null);
Object isLikeObj = data.get("isLike");
Boolean isLike = isLikeObj instanceof Boolean
? (Boolean) isLikeObj
: (isLikeObj != null && Boolean.parseBoolean(isLikeObj.toString()));
toolCommunityService.toggleLike(postId, isLike);
return CommonResult.success("操作成功");
}
@@ -368,7 +376,15 @@ public class ToolController {
@ApiOperation(value = "收藏/取消收藏")
@PostMapping("/community/collect")
public CommonResult<String> toggleCollect(@RequestBody Map<String, Object> data) {
toolCommunityService.toggleCollect((Long) data.get("postId"), (Boolean) data.get("isCollect"));
Object postIdObj = data.get("postId");
Long postId = postIdObj instanceof Number
? ((Number) postIdObj).longValue()
: (postIdObj != null ? Long.parseLong(postIdObj.toString()) : null);
Object isCollectObj = data.get("isCollect");
Boolean isCollect = isCollectObj instanceof Boolean
? (Boolean) isCollectObj
: (isCollectObj != null && Boolean.parseBoolean(isCollectObj.toString()));
toolCommunityService.toggleCollect(postId, isCollect);
return CommonResult.success("操作成功");
}

2
msh_crmeb_22/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemMenuServiceImpl.java
View File

@@ -79,7 +79,7 @@ public class SystemMenuServiceImpl extends ServiceImpl<SystemMenuDao, SystemMenu
lqw.like(SystemMenu::getName, request.getName());
}
if (StrUtil.isNotEmpty(request.getMenuType())) {
lqw.eq(SystemMenu::getName, request.getMenuType());
lqw.eq(SystemMenu::getMenuType, request.getMenuType());
}
lqw.eq(SystemMenu::getIsDelte, false);
lqw.orderByDesc(SystemMenu::getSort);

6
msh_crmeb_22/deploy.conf Normal file
View File

@@ -0,0 +1,6 @@
SERVER_HOST=49.235.131.69
SERVER_USER=root
SERVER_PORT=22
REMOTE_DIR=/www/crmeb
LOCAL_PORT=20822
JAR_NAME=sophia-front-2.2.jar

7
msh_crmeb_22/pom.xml
View File

@@ -347,6 +347,13 @@
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
</path>
</annotationProcessorPaths>
<!-- java8 保留参数名编译参数 -->
<compilerArgument>-parameters</compilerArgument>
<compilerArguments>