新增是否有未读消息和消息条数接口

新增修改密码接口

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/MessageController.java

@@ -271,4 +271,24 @@ public class MessageController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="消息设为已读")
+    @PostMapping("getMessageCount")
+    public MessageResult<Integer> getMessageCount(@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            //查询未读消息
+            List<Message> messageList = messageService.findNewByRecipientId(subject,"0");
+            msgResult.setData(messageList.size());
+            msgResult.setResult(true);
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/UserController.java

@@ -279,6 +279,52 @@ public class UserController {
 
         msgResult.setData(PojoUtils.pageWrapper(page));
 
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="修改密码")
+    @PostMapping("changePassword")
+    public MessageResult<Integer> changePassword(String oldPwd,String newPwd,@RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+
+            User user = userService.get(subject);
+
+            String curPwd = user.getPassword();
+
+            DES3 des3 = new DES3();
+
+            String oldPwdDes3 = des3.encrypt(jwtSecret, oldPwd);
+
+            if(curPwd.equals(oldPwdDes3)){
+                user.setPassword(des3.encrypt(jwtSecret, newPwd));
+                int affectCount = userService.update(user);
+
+                if(affectCount>0){
+                    msgResult.setResult(true);
+                    msgResult.setData(affectCount);
+                }
+                else{
+                    msgResult.setResult(false);
+                    msgResult.setMessage("数据库更新失败！");
+                }
+            }
+            else{
+                msgResult.setResult(false);
+                msgResult.setMessage("原密码错误！");
+            }
+
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+
+
         return msgResult;
     }
 }