1

src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.manage.common.CacheUtil;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.config.SaTokenConfigure;
 import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.entity.OperLog;
@@ -93,7 +94,6 @@ public class VisitLogInterceptor {
 			JSONObject jsonObject = JSON.parseObject(resultStr);
 			if(jsonObject.getInteger("code")== null || jsonObject.getInteger("code").equals(ServerCode.SUCCESS.code())){
 				msg = "操作成功";
-				result = updateResult(jsonObject);
 			}
 		}
 		//获取用户信息 如果已登录，从token中获取用户信息，如果是登录接口，查询数据库获取用户信息
@@ -217,28 +217,5 @@ public class VisitLogInterceptor {
 	}
 
 
-
-
-	private Object updateResult(JSONObject jsonObject) {
-		try {
-
-
-			JSONObject data = jsonObject.getJSONObject("data");
-			if(data != null && data.getJSONArray("list")!=null && !data.getJSONArray("list").isEmpty()){
-				JSONArray list = data.getJSONArray("list");
-				for (Object object : list) {
-					JSONObject obj = (JSONObject) object;
-					if(obj.containsKey("useType") && obj.getInteger("useType")!=null ){
-						obj.put("useTypeStr", CacheUtil.useTypeMap.get(obj.getInteger("useType")).getName());
-					}
-				}
-			}
-
-		}catch (Exception e){
-			log.info("updateResult-error:{}",e);
-		}
-		return jsonObject;
-
-	}
 }
 

src/main/java/com/fdkankan/manage/entity/AuthorizeInstall.java

@@ -101,6 +101,8 @@ public class AuthorizeInstall implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private String useTypeStr;
 
 
 }

src/main/java/com/fdkankan/manage/service/impl/AuthorizeInstallServiceImpl.java

@@ -68,11 +68,15 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
         Page<AuthorizeInstall> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeInstall::getSysUserId).collect(Collectors.toSet());
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
+        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
         for (AuthorizeInstall record : page.getRecords()) {
             if(userMap.get(record.getSysUserId())!=null){
                 record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
             }
+            if(typeMap.get(record.getUseType()) !=null){
+                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
+            }
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -142,18 +142,8 @@ public class DownOrderVo {
     }
 
     public String getUseTypeStr() {
-        if(useType == null){
-            return "";
-        }
-        switch (useType){
-            case 1 : return "项目实施";
-            case 2 : return "客户试用";
-            case 3 : return "内部测试";
-            case 4 : return "正常销售";
-            case 5 : return "渠道推广";
-            case 6 : return "其它";
-            default: return "";
-        }
+        return OrderVoStatus.getUserTypeStr(useType);
+
     }
 
     public String getDownTypeStr() {

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -150,18 +150,7 @@ public class IncrementOrderVo {
     }
 
     public String getUseTypeStr() {
-        if(useType == null){
-            return "";
-        }
-        switch (useType){
-            case 1 : return "项目实施";
-            case 2 : return "客户试用";
-            case 3 : return "内部测试";
-            case 4 : return "正常销售";
-            case 5 : return "渠道推广";
-            case 6 : return "其它";
-            default: return "";
-        }
+        return OrderVoStatus.getUserTypeStr(useType);
     }
 
     public String getIncrementTime() {

src/main/java/com/fdkankan/manage/vo/response/OrderVoStatus.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fdkankan.manage.common.CacheUtil;
 import org.apache.commons.lang3.StringUtils;
 
 public class OrderVoStatus {
@@ -23,4 +24,11 @@ public class OrderVoStatus {
             default: return "-";
         }
     }
+
+    public static String getUserTypeStr(Integer useType){
+        if(useType == null ||  CacheUtil.useTypeMap.get(useType) == null){
+            return "";
+        }
+        return CacheUtil.useTypeMap.get(useType).getName();
+    }
 }

src/main/java/com/fdkankan/manage/vo/response/UserIncrementVo.java

@@ -49,18 +49,8 @@ public class UserIncrementVo {
 
 
     public String getUseTypeStr() {
-        if(useType == null){
-            return "";
-        }
-        switch (useType){
-            case 1 : return "项目实施";
-            case 2 : return "客户试用";
-            case 3 : return "内部测试";
-            case 4 : return "正常销售";
-            case 5 : return "渠道推广";
-            case 6 : return "其它";
-            default: return "";
-        }
+        return OrderVoStatus.getUserTypeStr(useType);
+
     }
 
     public String getCustomerTypeStr() {