From 9b64c373654e93dd233a7cc2f6ff28f04daa0b38 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 28 一月 2026 18:37:55 +0800
Subject: [PATCH] bug 修复
---
/dev/null | 12 ------
server/web/src/main/java/com/doumee/api/web/ApiController.java | 5 +-
server/services/src/main/java/com/doumee/core/constants/Constants.java | 4 ++
server/services/src/main/java/com/doumee/dao/business/model/Multifile.java | 2
server/services/src/main/java/com/doumee/service/business/MemberService.java | 2 +
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 7 +--
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 29 +++++++++++++-
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 9 ----
8 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/LoginRequired.java b/server/services/src/main/java/com/doumee/core/annotation/LoginRequired.java
deleted file mode 100644
index e406b69..0000000
--- a/server/services/src/main/java/com/doumee/core/annotation/LoginRequired.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.doumee.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LoginRequired {
-
-}
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index cdc5e01..47fe3ae 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -19,6 +19,8 @@
public static final String HWY_OBS_ENDPOINT ="HWY_OBS_ENDPOINT" ;
public static final String HWY_OBS_BUCKET ="HWY_OBS_BUCKET" ;
public static final String RESOURCE_PATH ="RESOURCE_PATH" ;
+ public static final String ROLE_CONFIG ="ROLE_CONFIG" ;
+
public static final String QYWX_CORPID = "QYWX_CORPID";
public static final String QYWX_SECRET = "QYWX_SECRET";
public static final String QYWX_TOKEN = "QYWX_TOKEN";
@@ -82,6 +84,7 @@
public static final String ZBOM_UK_ERROR_URL ="ZBOM_UK_ERROR_URL" ;
public static final String ZBOM_TICKET_LOGIN_URL ="ZBOM_TICKET_LOGIN_URL" ;
public static final String OBJCET_STORAGE = "OBJCET_STORAGE";
+ public static final Object OBJECT_TYPE_CASES = "OBJECT_TYPE_CASES";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -89,6 +92,7 @@
public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;
public static final String REDIS_TOKEN_KEY = "token_";
+ public static final String CASES_FILES = "CASES_FILES";
public static final String SUCCESS = "SUCCESS";
public static final String FAIL = "FAIL";
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Category.java b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
index 06048b0..2a3eab5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
@@ -63,8 +63,8 @@
@ExcelColumn(name="鍗曚綅鍚嶇О")
private String name;
- @ApiModelProperty(value = "绫诲瀷:0=鍝佺閰嶇疆锛�1=杞﹁締绫诲瀷閰嶇疆锛�2=椁愭爣閰嶇疆锛�3=鎵嬬画璐归厤缃紱", example = "1")
- @ExcelColumn(name="绫诲瀷:0=鍝佺閰嶇疆锛�1=杞﹁締绫诲瀷閰嶇疆锛�2=椁愭爣閰嶇疆锛�3=鎵嬬画璐归厤缃紱")
+ @ApiModelProperty(value = "绫诲瀷:0=鎴樺尯;1=鍟嗕笟鍖�;2=鎿呴暱棰嗗煙;3=璁插笀绛夌骇;", example = "1")
+ @ExcelColumn(name="绫诲瀷:0=鎴樺尯;1=鍟嗕笟鍖�;2=鎿呴暱棰嗗煙;3=璁插笀绛夌骇;")
private Integer type;
@ApiModelProperty(value = "鍐呭锛堣溅杈嗚鏍笺�侀鏍囥�佹墜缁垂姣斾緥锛�")
@@ -84,9 +84,6 @@
@ApiModelProperty(value = "鏄惁鍥哄畾杞﹁締锛堣溅杈嗙被鍨嬩娇鐢級:0=鍚︼紱1=鏄紱", example = "1")
@TableField(exist = false)
private String updateUserName;
- @ApiModelProperty(value = "椁愭爣绛夐厤缃」闆嗗悎", example = "1")
- @TableField(exist = false)
- private JSONArray detailList;
@ApiModelProperty(value = "鍥炬爣鍏ㄨ矾寰�")
@TableField(exist = false)
private String iconFull;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index c563b6a..405d4ab 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -11,6 +11,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
+
/**
* 浼氬憳淇℃伅琛∕odel瀹氫箟
* @author doumee
@@ -115,6 +117,10 @@
@TableField(exist = false)
private Integer workYears;
+ @ApiModelProperty("鎿呴暱棰嗗煙鍚嶇О")
+ @TableField(exist = false)
+ private String fieldNames;
+
@ApiModelProperty("宸ヤ綔宀椾綅鍚嶇О")
@TableField(exist = false)
private String promotionName;
@@ -123,10 +129,29 @@
@TableField(exist = false)
private String levelName;
- @ApiModelProperty("鎴樺尯涓婚敭 - 鏌ヨ")
+ @ApiModelProperty("鎴樺尯缂栫爜 - 鏌ヨ")
@TableField(exist = false)
- private String queryZQId;
+ private String queryZQCode;
+ @ApiModelProperty("鎺掑簭淇℃伅锛�0=鏀惰垂浠庨珮鍒颁綆锛�1=鏀惰垂浠庝綆鍒伴珮锛�2=绛夌骇浠庨珮鍒颁綆锛�3=绛夌骇浠庝綆鍒伴珮锛�4=鏈嶅姟鏁颁粠楂樺埌浣�")
+ @TableField(exist = false)
+ private Integer orderByType;
+
+ @ApiModelProperty("璇佷欢鐓у叏璺緞")
+ @TableField(exist = false)
+ private String fullImgurl;
+
+ @ApiModelProperty("鏌ヨ鐢ㄦ埛绫诲瀷")
+ @TableField(exist = false)
+ private String queryUserRole;
+
+ @ApiModelProperty("鎿呴暱棰嗗煙")
+ @TableField(exist = false)
+ private List<Category> fieldList;
+
+ @ApiModelProperty("妗堜緥淇℃伅")
+ @TableField(exist = false)
+ private List<Cases> casesList;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
index cb1df32..8987430 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -55,7 +55,7 @@
// @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖", example = "1")
// @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖")
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0韬唤鐢宠璧勬枡 1璁㈠崟闄勪欢", example = "1")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0妗堜緥鍥鹃泦", example = "1")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberService.java b/server/services/src/main/java/com/doumee/service/business/MemberService.java
index f955039..402f916 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(Member model);
+
+ Member findDetailById(Integer id,String queryUserRole);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 56d9001..ecfde30 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -149,9 +149,6 @@
if(Objects.isNull(category)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(StringUtils.isNotBlank(category.getDetail())){
- category.setDetailList(JSONArray.parseArray(category.getDetail()));
- }
if(StringUtils.isNotBlank(category.getIcon())){
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
@@ -229,9 +226,6 @@
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
for(Category cate : result.getRecords()){
try {
- if(StringUtils.isNotBlank(cate.getDetail())){
- cate.setDetailList(JSONArray.parseArray(cate.getDetail()));
- }
if(StringUtils.isNotBlank(cate.getIcon())){
cate.setIconFull(path + cate.getIcon());
}
@@ -259,9 +253,6 @@
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
for (Category category:categoryList) {
- if(StringUtils.isNotBlank(category.getDetail())){
- category.setDetailList(JSONArray.parseArray(category.getDetail()));
- }
if(StringUtils.isNotBlank(category.getIcon())){
category.setIconFull(path + category.getIcon());
}
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index c9eb82a..b6e10cb 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.vo.WebLoginUserVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
@@ -39,10 +40,10 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛瀵硅薄淇℃伅
* @return
*/
- protected Member getMemberResponse(){
+ protected WebLoginUserVO getMemberResponse(){
Object obj = this.getRequest().getAttribute(JwtTokenUtil.MEMBER_INFO);
if(obj != null){
- return JSONObject.parseObject(obj.toString(),Member.class);
+ return JSONObject.parseObject(obj.toString(), WebLoginUserVO.class);
}
return null;
}
--
Gitblit v1.9.3