本地版本新增接口

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

@@ -6,7 +6,7 @@ import com.fdkankan.manage.vo.request.OrderParam;
 public class CacheUtil {
 
     public static String uploadType;
-
     public static OrderParam orderParam = new OrderParam();
     public static AgentNewLogParam agentParam = new AgentNewLogParam();
+
 }

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

@@ -7,4 +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";
+
+
 }

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

@@ -60,6 +60,7 @@ public enum ResultCode  {
     AGENT_NOT_EMPTY(50043, "经销商名称已存在!"),
     CAMERA_NOT_MOVE(50044, "场景在改相机中，无需迁移!"),
     SCENE_REBUILD_ERROR(50045, "场景重算失败。。。"),
+    PASSWORD_ERROR_G(50046, "密码格式错误！"),
 
     ;
 

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

@@ -128,5 +128,16 @@ public class UserController {
         userService.addUcenterUser(userParam);
         return ResultData.ok();
     }
+
+    @PostMapping("/delUcenterUser")
+    public ResultData delUcenterUser(@RequestBody UserParam userParam){
+        userService.delUcenterUser(userParam);
+        return ResultData.ok();
+    }
+    @PostMapping("/ReUcenterUserPassword")
+    public ResultData ReUcenterUserPassword(@RequestBody UserParam userParam){
+        userService.ReUcenterUserPassword(userParam);
+        return ResultData.ok();
+    }
 }
 

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

@@ -134,5 +134,8 @@ public class User implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
 
 }

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

@@ -7,6 +7,7 @@ import com.fdkankan.manage.vo.request.SysUserParam;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 
 import java.util.HashMap;
+import java.util.Set;
 
 /**
  * <p>
@@ -27,4 +28,6 @@ public interface ISysUserService extends IService<SysUser> {
     PageInfo pageList(SysUserParam param);
 
     HashMap<Long, Long> groupByRoleId();
+
+    HashMap<Long, SysUser> getByIds(Set<Long> sysUserIds);
 }

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

@@ -33,4 +33,8 @@ public interface IUserService extends IService<User> {
     Boolean checkUserName(String userName);
 
     void addUcenterUser(UserParam userParam);
+
+    void delUcenterUser(UserParam userParam);
+
+    void ReUcenterUserPassword(UserParam userParam);
 }

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

@@ -28,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -134,4 +131,14 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         }
         return map;
     }
+
+    @Override
+    public HashMap<Long, SysUser> getByIds(Set<Long> sysUserIds) {
+        HashMap<Long, SysUser> map = new HashMap<>();
+        if(sysUserIds.size() >0){
+            List<SysUser> sysUsers = this.listByIds(sysUserIds);
+            sysUsers.forEach(entity-> map.put(entity.getId(),entity));
+        }
+        return map;
+    }
 }

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

@@ -1,15 +1,22 @@
 package com.fdkankan.manage.service.impl;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.OssPath;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.IUserMapper;
 import com.fdkankan.manage.service.*;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
@@ -19,10 +26,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +51,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private IScenePlusService scenePlusService;
     @Autowired
     private LaserService laserService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -92,6 +97,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         List<UserVo> voList = new ArrayList<>();
         if(userList.size() >0){
             List<Long> userIdList = userList.parallelStream().map(User::getId).collect(Collectors.toList());
+            Set<Long> sysUserIds = userList.stream().map(User::getSysUserId).collect(Collectors.toSet());
+            HashMap<Long, SysUser> sysMap = sysUserService.getByIds(sysUserIds);
+
             HashMap<Long,Long> incrementCountMap = userIncrementService.getValidCountGroupByUserId(userIdList);
             HashMap<Long,Long> cameraCountMap = cameraDetailService.getCountGroupByUserId(userIdList);
             HashMap<Long,Long> sceneCountMap = sceneService.getCountGroupByUserId(userIdList);
@@ -119,6 +127,12 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
                 vo.setCameraCount(cameraCount);
                 vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + pageInfo.getTotal());
+                if(user.getSysUserId() != null){
+                    SysUser sysUser = sysMap.get(user.getSysUserId());
+                    if(sysUser != null){
+                        vo.setSysUserName(sysUser.getNickName());
+                    }
+                }
                 voList.add(vo);
             }
         }
@@ -152,15 +166,62 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public void addUcenterUser(UserParam userParam) {
-        if(StringUtils.isBlank(userParam.getUserName()) || StringUtils.isBlank(userParam.getNickName()) || StringUtils.isBlank(userParam.getPassword())){
+    public void addUcenterUser(UserParam param) {
+        if(StringUtils.isBlank(param.getUserName()) || StringUtils.isBlank(param.getNickName()) || StringUtils.isBlank(param.getPassword())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        Boolean ubo = this.checkUserName(userParam.getUserName());
+        Boolean ubo = this.checkUserName(param.getUserName());
         if(ubo){
             throw new BusinessException(ResultCode.USER_EXIST);
         }
+        try {
+            String passwordMd5 = SecurityUtil.MD5(Base64Converter.decode(Base64Converter.subText(param.getPassword())));
+            User user = new User();
+            user.setHead(OssPath.default_head);
+            user.setPassword(passwordMd5);
+            user.setStatus(1);
+            user.setIsNotice(1);
+            user.setRegisterTime(new Date());
+            user.setUserName(param.getUserName());
+            user.setNickName(param.getNickName());
+            user.setCountry("86");
+            user.setDownloadNumTotal(1000);
+            user.setDownloadNum(0);
+            user.setCreateTime(Dateutils.getDate(new Date()));
+            user.setRecStatus("A");
+            user.setUpdateTime(Dateutils.getDate(new Date()));
+            this.save(user);
+
+        }catch (Exception e){
+            log.error("ReUcenterUserPassword：error",e);
+        }
+        throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
+
+    }
+
+    @Override
+    public void delUcenterUser(UserParam userParam) {
+        if(userParam.getId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        this.removeById(userParam.getId());
+    }
 
+    @Override
+    public void ReUcenterUserPassword(UserParam userParam) {
+        if(userParam.getId() == null || StringUtils.isBlank(userParam.getNewPassword())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        try {
+            String passwordMd5 = SecurityUtil.MD5(Base64Converter.decode(Base64Converter.subText(userParam.getPassword())));
+            LambdaUpdateWrapper<User> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(User::getId,userParam.getId());
+            wrapper.set(User::getPassword,passwordMd5);
+            this.update(wrapper);
+        }catch (Exception e){
+            log.error("ReUcenterUserPassword：error",e);
+        }
+        throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
 
     }
 }

src/main/java/com/fdkankan/manage/vo/request/UserParam.java

@@ -12,4 +12,5 @@ public class UserParam extends RequestBase {
     private String nickName;
 
     private String password;
+    private String newPassword;
 }

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

@@ -15,4 +15,7 @@ public class UserVo {
     private Integer surDownNum;     //剩余下载次数
     private Long cameraCount;       //相机数量
     private Long SceneNum;          //场景数量
+
+    private String sysUserName;
+    private Long sysUserId;
 }