修改报警通知的邮箱

license/src/main/java/iot/sixiang/license/controller/UserController.java

@@ -14,6 +14,7 @@ import iot.sixiang.license.log.MyLog;
 import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.PageInfoModel;
 import iot.sixiang.license.model.PageResult;
+import iot.sixiang.license.model.dto.UpdateNotifyDTO;
 import iot.sixiang.license.model.vo.UserVo;
 import iot.sixiang.license.service.UserService;
 import iot.sixiang.license.util.CommonUtil;
@@ -24,7 +25,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author m33
@@ -40,15 +41,16 @@ public class UserController {
 
     /**
      * 添加user
+     *
      * @param jsonObject
      * @return
      */
     @ApiOperation(value = "用户添加接口", notes = "用于添加用户")
     @PostMapping("add")
     @MyLog(title = "添加用户", optParam = "#{jsonObject}", businessType = BusinessType.INSERT)
-    @ApiOperationSupport(params = @DynamicParameters(name = "jsonObject",properties = {
-            @DynamicParameter(name = "userName",value = "账户名",required = true,dataTypeClass = String.class),
-            @DynamicParameter(name = "company",value = "公司名",required = true,dataTypeClass = String.class)
+    @ApiOperationSupport(params = @DynamicParameters(name = "jsonObject", properties = {
+            @DynamicParameter(name = "userName", value = "账户名", required = true, dataTypeClass = String.class),
+            @DynamicParameter(name = "company", value = "公司名", required = true, dataTypeClass = String.class)
     }))
     public BaseResult addUser(@RequestBody JSONObject jsonObject) {
         String userName = (String) jsonObject.get("userName");
@@ -64,6 +66,7 @@ public class UserController {
 
     /**
      * 删除user
+     *
      * @param userId
      * @return
      */
@@ -81,15 +84,16 @@ public class UserController {
 
     /**
      * 修改user
+     *
      * @param jsonObject
      * @return
      */
     @ApiOperation(value = "用户修改接口", notes = "修改用户")
     @PostMapping("update")
     @MyLog(title = "修改用户", optParam = "#{userId},#{password}", businessType = BusinessType.UPDATE)
-    @ApiOperationSupport(params = @DynamicParameters(name = "jsonObject",properties = {
-            @DynamicParameter(name = "userId",value = "用户Id",required = true,dataTypeClass = Integer.class),
-            @DynamicParameter(name = "password",value = "密码",required = true,dataTypeClass = String.class)
+    @ApiOperationSupport(params = @DynamicParameters(name = "jsonObject", properties = {
+            @DynamicParameter(name = "userId", value = "用户Id", required = true, dataTypeClass = Integer.class),
+            @DynamicParameter(name = "password", value = "密码", required = true, dataTypeClass = String.class)
     }))
     public BaseResult updateUser(@RequestBody JSONObject jsonObject) {
         int userId = jsonObject.getInteger("userId");
@@ -105,6 +109,7 @@ public class UserController {
 
     /**
      * 分页查询所有的user
+     *
      * @param pageNo
      * @param pageSize
      * @return
@@ -113,24 +118,30 @@ public class UserController {
     @GetMapping("list")
     @MyLog(title = "获取用户列表", optParam = "#{pageNo},#{pageSize},#{userName},#{company}", businessType = BusinessType.SELECT)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNo",value = "当前在第几页", required = true,dataType = "int"),
-            @ApiImplicitParam(name = "pageSize",value = "每页显示多少条", required = true, dataType = "int"),
-            @ApiImplicitParam(name = "userName",value = "用户名"),
-            @ApiImplicitParam(name = "company",value = "公司名")
+            @ApiImplicitParam(name = "pageNo", value = "当前在第几页", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "每页显示多少条", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "userName", value = "用户名"),
+            @ApiImplicitParam(name = "company", value = "公司名")
     })
     public PageResult<UserVo> getUserList(@RequestParam(value = "pageNo", defaultValue = "0") int pageNo,
-                                     @RequestParam(value = "pageSize",defaultValue = "0") int pageSize,
-                                     @RequestParam(value = "userName",required = false) String userName,
-                                     @RequestParam(value = "company",required = false) String company) {
-        PageInfoModel<UserVo> records = userService.getUserList(pageNo,pageSize,userName,company);
+                                          @RequestParam(value = "pageSize", defaultValue = "0") int pageSize,
+                                          @RequestParam(value = "userName", required = false) String userName,
+                                          @RequestParam(value = "company", required = false) String company) {
+        PageInfoModel<UserVo> records = userService.getUserList(pageNo, pageSize, userName, company);
         int total = records.getTotal();
-        int pages = total/pageSize;//pages为总页数
-        int mod = total%pageSize;
-        if(mod!=0){
+        int pages = total / pageSize;//pages为总页数
+        int mod = total % pageSize;
+        if (mod != 0) {
             pages = pages + 1;
         }
         List<UserVo> result = records.getResult();
-        return new PageResult(200,"查找成功",pageNo,pages,total,result);
+        return new PageResult(200, "查找成功", pageNo, pages, total, result);
+    }
+
+    @ApiOperation(value = "修改通知人接口", notes = "修改通知人邮箱")
+    @PostMapping("update_notify")
+    public BaseResult updateNotify(@RequestBody UpdateNotifyDTO updateNotifyDTO) {
+        return userService.updateNotify(updateNotifyDTO);
     }
 }
 

license/src/main/java/iot/sixiang/license/model/dto/UpdateNotifyDTO.java

+package iot.sixiang.license.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m33
+ * Date 2023/1/30 14:18
+ * Description
+ */
+@Data
+public class UpdateNotifyDTO {
+    @ApiModelProperty("通知人邮箱")
+    private String notify;
+}

license/src/main/java/iot/sixiang/license/service/UserService.java

 package iot.sixiang.license.service;
 
+import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.PageInfoModel;
+import iot.sixiang.license.model.dto.UpdateNotifyDTO;
 import iot.sixiang.license.model.vo.UserVo;
 
 /**
@@ -20,4 +22,6 @@ public interface UserService{
     boolean updateUser(int userId, String password);
 
     PageInfoModel<UserVo> getUserList(int pageNo, int pageSize, String userName, String company);
+
+    BaseResult updateNotify(UpdateNotifyDTO updateNotifyDTO);
 }

license/src/main/java/iot/sixiang/license/service/impl/UserServiceImpl.java

@@ -2,12 +2,16 @@ package iot.sixiang.license.service.impl;
 
 
 import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import iot.sixiang.license.consts.ResultCode;
 import iot.sixiang.license.entity.User;
 import iot.sixiang.license.handler.IotLicenseException;
+import iot.sixiang.license.jwt.UserUtils;
 import iot.sixiang.license.mapper.UserMapper;
+import iot.sixiang.license.model.BaseResult;
 import iot.sixiang.license.model.PageInfoModel;
+import iot.sixiang.license.model.dto.UpdateNotifyDTO;
 import iot.sixiang.license.model.vo.UserVo;
 import iot.sixiang.license.service.UserService;
 import iot.sixiang.license.util.CommonUtil;
@@ -17,12 +21,13 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author m33
@@ -35,11 +40,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     UserMapper userMapper;
 
     @Override
-    public PageInfoModel<UserVo> getUserList(int pageNo, int pageSize,String userName, String company) {
-        if(pageNo == 0 || pageSize == 0) {
-            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
+    public PageInfoModel<UserVo> getUserList(int pageNo, int pageSize, String userName, String company) {
+        if (pageNo == 0 || pageSize == 0) {
+            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(), ResultCode.VALIDATE_FAILED.getMsg());
         }
-        List<UserVo> records = userMapper.getUserList(userName,company);
+        List<UserVo> records = userMapper.getUserList(userName, company);
         records = records.stream().sorted(Comparator.comparing(UserVo::getCreateTime, Comparator.reverseOrder())).collect(Collectors.toList());
         List<UserVo> result = new ArrayList<>();
         int begin = (pageNo - 1) * pageSize;
@@ -52,10 +57,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return objectPageInfoModel;
     }
 
+    @Override
+    public BaseResult updateNotify(UpdateNotifyDTO updateNotifyDTO) {
+        String notify = updateNotifyDTO.getNotify();
+        String loginUserId = UserUtils.getLoginUserId();
+        if (StringUtils.isEmpty(notify) || !Validator.isEmail(notify)) {
+            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(), ResultCode.VALIDATE_FAILED.getMsg());
+        }
+        if (StringUtils.isEmpty(loginUserId)) {
+            throw new IotLicenseException(ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMsg());
+        }
+        int userId = Integer.parseInt(loginUserId);
+        User user = new User();
+        user.setNotify(notify);
+        user.setUpdateTime(new Date());
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(User::getUserId, userId);
+        int res = userMapper.update(user, wrapper);
+        if (res > 0) {
+            return BaseResult.success();
+        } else {
+            return BaseResult.failed();
+        }
+    }
+
     @Override
     public boolean deleteUser(int userId) {
-        if(userId == 0) {
-            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
+        if (userId == 0) {
+            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(), ResultCode.VALIDATE_FAILED.getMsg());
         }
         return userMapper.deleteUser(userId);
     }
@@ -73,14 +102,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (res != null) {
             throw new IotLicenseException(403, "用户名已存在");
         }
-        return userMapper.addUser(userName,company,password, notify);
+        return userMapper.addUser(userName, company, password, notify);
     }
 
     @Override
     public boolean updateUser(int userId, String password) {
-        if(userId == 0 || StringUtils.isEmpty(password)) {
-            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
+        if (userId == 0 || StringUtils.isEmpty(password)) {
+            throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(), ResultCode.VALIDATE_FAILED.getMsg());
         }
-        return userMapper.updateUser(userId,password);
+        return userMapper.updateUser(userId, password);
     }
 }