局域网过滤深时

src/main/java/com/fdkankan/manage/common/OssPath.java

@@ -7,7 +7,7 @@ public class OssPath {
     public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
     public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"status.json";   //获取临时文件目录
 
-    public final static String default_head ="oss/4dkankan/manage/user/newHead.png";
+    public final static String default_head ="manage/user/newHead.png";
 
 
 }

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

@@ -38,12 +38,17 @@ public class AgentNewLog implements Serializable {
      */
     @TableField("type")
     private Integer type;
+    /**
+     * 0 经销商授权，1经销商续费,2官网自购，3平台授权
+     */
+    @TableField("give_type")
+    private Integer giveType;
 
     /**
      * 授权对象id
      */
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
 
     /**
      * 授权次数

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

@@ -94,5 +94,6 @@ public class UserIncrement implements Serializable {
     @TableField("download_num")
     private Integer downloadNum;
 
-
+    @TableField("agent_id")
+    private Integer agentId;
 }

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

@@ -3,6 +3,7 @@ package com.fdkankan.manage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.AgentNewLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
 import com.fdkankan.manage.vo.response.AgentNewLogVo;
 
@@ -19,4 +20,6 @@ import java.util.List;
 public interface IAgentNewLogService extends IService<AgentNewLog> {
 
     List<AgentNewLogVo> getVoList( AgentNewLogParam param);
+
+    void addByUserIncrement(UserIncrement userIncrement);
 }

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

@@ -1,12 +1,16 @@
 package com.fdkankan.manage.service.impl;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.AgentNew;
 import com.fdkankan.manage.entity.AgentNewLog;
+import com.fdkankan.manage.entity.IncrementType;
+import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.mapper.IAgentNewLogMapper;
 import com.fdkankan.manage.service.IAgentNewLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IAgentNewService;
+import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
 import com.fdkankan.manage.vo.response.AgentLogGVo;
 import com.fdkankan.manage.vo.response.AgentNewLogVo;
@@ -30,6 +34,8 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
     @Autowired
     IAgentNewService agentNewService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
 
     @Override
     public List<AgentNewLogVo> getVoList( AgentNewLogParam param) {
@@ -59,4 +65,23 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
         }
         return list;
     }
+
+    @Override
+    public void addByUserIncrement(UserIncrement userIncrement) {
+        if(userIncrement.getAgentId() !=null){
+            AgentNewLog log = new AgentNewLog();
+            if(userIncrement.getIncrementTypeId() != null){
+                IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+                if(incrementType!=null){
+                    log.setType(incrementType.getValidTimeType());
+                }
+            }
+            log.setAgentId(userIncrement.getAgentId());
+            log.setUserId(userIncrement.getUserId());
+            log.setGiveType(3);
+            log.setCount(1);
+            this.save(log);
+        }
+
+    }
 }

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

@@ -13,10 +13,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.mapper.IUserIncrementMapper;
-import com.fdkankan.manage.service.ICameraService;
-import com.fdkankan.manage.service.IIncrementTypeService;
-import com.fdkankan.manage.service.IUserIncrementService;
-import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
 import com.fdkankan.manage.vo.response.UserIncrementVo;
@@ -44,6 +41,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     IIncrementTypeService incrementTypeService;
     @Autowired
     IUserService userService;
+    @Autowired
+    IAgentNewLogService agentNewLogService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -111,7 +110,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         Date date = DateUtil.string2Date(userIncrement.getIncrementEndTime(), DateUtil.DEFAULT_DATE_FORMAT);
         Date delay = DateUtil.delay(date, 1, 1);
         userIncrement.setIncrementEndTime(DateUtil.date2String(delay,DateUtil.DEFAULT_DATE_FORMAT));
+        userIncrement.setUpdateTime(null);
         this.updateById(userIncrement);
+        agentNewLogService.addByUserIncrement(userIncrement);
     }
 
     @Override

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.OssPath;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.SysUser;
@@ -117,9 +118,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 long scenePlusCount = scenePlusCountMap.get(user.getId()) == null ? 0 : scenePlusCountMap.get(user.getId());
                 //  long sceneProObjCount = sceneProCountObjMap.get(user.getId()) == null ? 0 : sceneProCountObjMap.get(user.getId());
                 //  long scenePlusObjCount = scenePlusCountObjMap.get(user.getId()) == null ? 0 : scenePlusCountObjMap.get(user.getId());
-                SceneParam param = new SceneParam();
-                param.setUserName(user.getUserName());
-                PageInfo pageInfo = laserService.pageList(param);
+
+                Long ssNum = 0L;
+                if(!CacheUtil.uploadType.equals("local")){
+                    SceneParam param = new SceneParam();
+                    param.setUserName(user.getUserName());
+                    PageInfo pageInfo = laserService.pageList(param);
+                    ssNum =  pageInfo.getTotal();
+                }
 
                 UserVo vo = new UserVo();
                 BeanUtils.copyProperties(user,vo);
@@ -127,7 +133,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 vo.setIncrementCount(incrementCount);
                 vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
                 vo.setCameraCount(cameraCount);
-                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + pageInfo.getTotal());
+                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + ssNum);
                 if(user.getSysUserId() != null){
                     SysUser sysUser = sysMap.get(user.getSysUserId());
                     if(sysUser != null){