离线包状态

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

@@ -7,11 +7,15 @@ import cn.hutool.http.ContentType;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.alibaba.fastjson.JSON;
+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.config.SaTokenConfigure;
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.entity.OperLog;
 import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -89,6 +93,7 @@ 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中获取用户信息，如果是登录接口，查询数据库获取用户信息
@@ -133,6 +138,7 @@ public class VisitLogInterceptor {
 		return result;
 	}
 
+
 	private String getRequestPath(String uri) {
 		if(uri.contains("/login")){
 			return "登录";
@@ -210,5 +216,29 @@ public class VisitLogInterceptor {
 		return  String.format(browserFormat, browserType, browserVersion);
 	}
 
+
+
+
+	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/common/CacheUtil.java

@@ -1,9 +1,12 @@
 package com.fdkankan.manage.common;
 
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
 import com.fdkankan.manage.vo.request.FeedbackParam;
 import com.fdkankan.manage.vo.request.OrderParam;
 
+import java.util.HashMap;
+
 public class CacheUtil {
 
     public static String uploadType;
@@ -17,6 +20,5 @@ public class CacheUtil {
     public static AgentNewLogParam agentParam = new AgentNewLogParam();
     public static FeedbackParam feedbackParam = new FeedbackParam();
 
-
-
+    public static  HashMap<Integer, IncrementUseType> useTypeMap = new HashMap<>();
 }

src/main/java/com/fdkankan/manage/config/MenuInit.java

@@ -1,7 +1,10 @@
 package com.fdkankan.manage.config;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.manage.common.CacheUtil;
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.entity.SysMenu;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
 import com.fdkankan.manage.service.ISysMenuService;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
@@ -10,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.List;
 
 @Component
@@ -20,6 +24,9 @@ public class MenuInit {
     ISysMenuService sysMenuService;
 
     @Autowired
+    IIncrementUseTypeService incrementUseTypeService;
+
+    @Autowired
     RedisUtil redisUtil;
 
     @PostConstruct
@@ -28,5 +35,7 @@ public class MenuInit {
         String result = JSONObject.toJSONString(list);
         redisUtil.set(RedisKey.MANAGE_MENU,result );
         log.info("项目启动加载系统菜单权限至redis:{}",result);
+
+        CacheUtil.useTypeMap  = incrementUseTypeService.getTypeMap();
     }
 }

src/main/java/com/fdkankan/manage/controller/IncrementUseTypeController.java

@@ -1,7 +1,9 @@
 package com.fdkankan.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.service.IIncrementUseTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +28,9 @@ public class IncrementUseTypeController {
 
     @GetMapping("/allList")
     public ResultData allList(){
-        return ResultData.ok(incrementUseTypeService.list());
+        LambdaQueryWrapper<IncrementUseType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByAsc(IncrementUseType::getSort);
+        return ResultData.ok( incrementUseTypeService.list(wrapper));
     }
 }
 

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

@@ -134,18 +134,4 @@ public class AuthorizeCamera implements Serializable {
     private String useTypeStr;
 
 
-    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 "";
-        }
-    }
 }

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

@@ -101,22 +101,6 @@ public class AuthorizeInstall implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField(exist = false)
-    private String useTypeStr;
-
-
-    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 "";
-        }
-    }
+
+
 }

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

@@ -111,18 +111,4 @@ public class AuthorizeModeling implements Serializable {
     private String useTypeStr;
 
 
-    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 "";
-        }
-    }
 }

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

@@ -53,5 +53,7 @@ public class IncrementUseType implements Serializable {
     @TableField("type")
     private Integer type;
 
+    @TableField("sort")
+    private Integer sort;
 
 }

src/main/java/com/fdkankan/manage/service/IIncrementUseTypeService.java

@@ -3,6 +3,8 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.IncrementUseType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIncrementUseTypeService extends IService<IncrementUseType> {
 
+    HashMap<Integer, IncrementUseType> getTypeMap();
+
 }

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

@@ -51,11 +51,13 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
     ICameraService cameraService;
     @Autowired
     ICameraDetailService cameraDetailService;
-
+    @Autowired
+    IIncrementUseTypeService iIncrementUseTypeService;
     @Override
     public Object pageList(AuthorizeParam param) {
 
         Page<AuthorizeCamera> page = getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeCamera::getSysUserId).collect(Collectors.toSet());
         Set<Integer> Ids = page.getRecords().stream().map(AuthorizeCamera::getId).collect(Collectors.toSet());
@@ -73,6 +75,9 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                 }
             }
             record.setSnCodes(snCodes);
+            if(typeMap.get(record.getUseType()) !=null){
+                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
+            }
         }
         return PageInfo.PageInfo(page);
     }

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

@@ -7,11 +7,13 @@ import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AuthorizeInstall;
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAuthorizeInstallMapper;
 import com.fdkankan.manage.service.IAuthorizeInstallService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import com.fdkankan.reg.RegCodeUtil;
@@ -38,6 +40,8 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
 
     @Autowired
     ISysUserService sysUserService;
+    @Autowired
+    IIncrementUseTypeService iIncrementUseTypeService;
 
     @Override
     public Object pageList(AuthorizeParam param) {
@@ -64,10 +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/service/impl/AuthorizeModelingServiceImpl.java

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.AuthorizeCamera;
 import com.fdkankan.manage.entity.AuthorizeModeling;
+import com.fdkankan.manage.entity.IncrementUseType;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.IAuthorizeModelingMapper;
 import com.fdkankan.manage.service.IAuthorizeModelingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import org.apache.commons.lang3.StringUtils;
@@ -33,7 +35,8 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
 
     @Autowired
     ISysUserService sysUserService;
-
+    @Autowired
+    IIncrementUseTypeService iIncrementUseTypeService;
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AuthorizeModeling> wrapper = new LambdaQueryWrapper<>();
@@ -52,11 +55,17 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
         wrapper.orderByDesc(AuthorizeModeling::getCreateTime);
         Page<AuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeModeling::getSysUserId).collect(Collectors.toSet());
+        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
+
+
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
         for (AuthorizeModeling 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/service/impl/IncrementUseTypeServiceImpl.java

@@ -6,6 +6,9 @@ import com.fdkankan.manage.service.IIncrementUseTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementUseTypeServiceImpl extends ServiceImpl<IIncrementUseTypeMapper, IncrementUseType> implements IIncrementUseTypeService {
 
+    @Override
+    public HashMap<Integer, IncrementUseType> getTypeMap() {
+        HashMap<Integer, IncrementUseType> map = new HashMap<>();
+        List<IncrementUseType> list = this.list();
+        list.forEach(e ->map.put(e.getId(),e));
+        return map;
+    }
 }

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

@@ -127,17 +127,7 @@ public class DownOrderVo {
 
 
     public String getPayStatus() {
-        if(payStatus == null){
-            return "";
-        }
-        switch (payStatus){
-            case "-1" :
-            case "0" :
-                return "未付款";
-            case "-2" : return "已退款";
-            case "1" : return "已付款";
-            default: return "";
-        }
+        return OrderVoStatus.getPayStatus(payStatus, customerPayTime, useType);
     }
 
     public String getCustomerTypeStr() {

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

@@ -134,19 +134,10 @@ public class IncrementOrderVo {
 
 
     public String getPayStatus() {
-        if(payStatus == null){
-            return "";
-        }
-        switch (payStatus){
-            case "-1" :
-            case "0" :
-                return "未付款";
-            case "-2" : return "已退款";
-            case "1" : return "已付款";
-            default: return "";
-        }
+        return OrderVoStatus.getPayStatus(payStatus, customerPayTime, useType);
     }
 
+
     public String getCustomerTypeStr() {
         if(customerType == null){
             return "";

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

@@ -0,0 +1,26 @@
+package com.fdkankan.manage.vo.response;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class OrderVoStatus {
+
+    public static String getPayStatus(String payStatus, String customerPayTime, Integer useType) {
+        if(payStatus == null){
+            return "-";
+        }
+        if(StringUtils.isBlank(customerPayTime)){
+            return "-";
+        }
+        if(useType != null && useType == 3){
+            return "-";
+        }
+        switch (payStatus){
+            case "-1" :
+            case "0" :
+                return "未付款";
+            case "-2" : return "已退款";
+            case "1" : return "已付款";
+            default: return "-";
+        }
+    }
+}