feats

src/main/java/com/yunzhi/demo/controller/LoginController.java

@@ -5,6 +5,7 @@ import com.yunzhi.demo.entity.SysLogin;
 import com.yunzhi.demo.entity.SysUser;
 import com.yunzhi.demo.service.ISysLoginService;
 import com.yunzhi.demo.service.ISysUserService;
+import com.yunzhi.demo.vo.ChangePassword;
 import com.yunzhi.demo.vo.LoginParam;
 import com.yunzhi.demo.vo.TokenParam;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -76,6 +78,27 @@ public class LoginController extends BaseController {
         return ResponseBean.success(res);
     }
 
+
+    @PutMapping("/admin/change-password")
+    @ApiOperation(value="修改密码", notes = "修改密码", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean changePassword(@ApiParam("修改密码参数") @RequestBody ChangePassword param) throws Exception {
+        if (StringUtils.isEmpty(param.getOriginPassword()) || StringUtils.isEmpty(param.getNewPassword())) {
+            return ResponseBean.error("原始密码或新密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        SysUser currentUser = getCurrentUser();
+        SysLogin sysLogin = iSysLoginService.getByUser(currentUser.getUserId());
+
+        if (!checkPassword(param.getOriginPassword(), currentUser.getUserId(), sysLogin.getPassword())) {
+            return ResponseBean.error("原始密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        sysLogin.setPassword(EncryptUtils.md5(param.getNewPassword(), currentUser.getUserId()));
+        iSysLoginService.updateById(sysLogin);
+
+        return ResponseBean.success("密码修改成功");
+    }
+
     private boolean checkPassword(String src, String targ, String salt) {
         return EncryptUtils.md5(src, salt).equals(targ);
     }

src/main/java/com/yunzhi/demo/controller/SysBannerController.java

@@ -42,26 +42,6 @@ public class SysBannerController extends BaseController {
     @Autowired
     public ISysBannerService iSysBannerService;
 
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/sysBanner",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysBannerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<SysBanner> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<SysBanner> result = iSysBannerService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
     /**
      * 分页查询列表
      * @param pageNum
@@ -75,29 +55,16 @@ public class SysBannerController extends BaseController {
                                    @ApiParam("标题") @RequestParam(value = "title", required = false) String title) throws Exception{
 
         IPage<SysBanner> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>().like(!StringUtils.isEmpty(title), "title", title);
-        queryWrapper.orderByDesc("create_date");
+        QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>()
+                .like(!StringUtils.isEmpty(title), "title", title)
+                .gt("status", Constants.STATUS_DELETED)
+                .orderByAsc("sort_no")
+                .orderByDesc("create_date");
 
         IPage<SysBanner> result = iSysBannerService.page(pg, queryWrapper);
         return ResponseBean.success(result);
     }
 
-    /**
-     * 保存对象
-     * @param sysBanner 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysBanner",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysBannerAdd(@ApiParam("保存内容") @RequestBody SysBanner sysBanner) throws Exception{
-
-        if (iSysBannerService.save(sysBanner)){
-            return ResponseBean.success(sysBanner);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
     /**
      * 保存对象
      * @param sysBanner 实体对象
@@ -118,48 +85,21 @@ public class SysBannerController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysBanner/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/banner/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysBannerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysBannerService.removeById(id)){
+    public ResponseBean bannerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        SysBanner sysBanner = iSysBannerService.getById(id);
+        if (null == sysBanner || Constants.STATUS_DELETED.equals(sysBanner.getStatus())) {
             return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/banner/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean bannerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysBannerService.removeById(id)){
+        if(iSysBannerService.updateById(sysBanner)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysBanner 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysBanner/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysBannerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysBanner sysBanner) throws Exception{
-
-        if (iSysBannerService.updateById(sysBanner)){
-            return ResponseBean.success(iSysBannerService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
     /**
      * 修改对象
      * @param id  实体ID
@@ -178,16 +118,6 @@ public class SysBannerController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysBanner/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysBannerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysBannerService.getById(id));
-    }
-
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -195,6 +125,11 @@ public class SysBannerController extends BaseController {
     @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean bannerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysBannerService.getById(id));
+        SysBanner sysBanner = iSysBannerService.getById(id);
+        if (null == sysBanner || Constants.STATUS_DELETED.equals(sysBanner.getStatus())) {
+            return ResponseBean.error("未找到当前ID对应信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(sysBanner);
     }
 }

src/main/java/com/yunzhi/demo/controller/SysLoginController.java

@@ -39,81 +39,4 @@ public class SysLoginController extends BaseController {
     @Autowired
     public ISysLoginService iSysLoginService;
 
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/sysLogin",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysLoginList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<SysLogin> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysLogin> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<SysLogin> result = iSysLoginService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param sysLogin 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysLogin",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysLoginAdd(@ApiParam("保存内容") @RequestBody SysLogin sysLogin) throws Exception{
-
-        if (iSysLoginService.save(sysLogin)){
-            return ResponseBean.success(sysLogin);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysLogin/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysLoginDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysLoginService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param sysLogin 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysLogin/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean sysLoginUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysLogin sysLogin) throws Exception{
-
-        if (iSysLoginService.updateById(sysLogin)){
-            return ResponseBean.success(iSysLoginService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysLogin/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysLoginGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysLoginService.getById(id));
-    }
 }

src/main/java/com/yunzhi/demo/controller/TaPersonController.java

@@ -69,16 +69,6 @@ public class TaPersonController extends BaseController {
                                      @ApiParam("学号") @RequestParam(value ="studentId", required = false) String studentId) throws Exception{
 
 		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
-                    .gt("student_id", "")
-                    .gt("status", Constants.STATUS_DELETED)
-                    .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
-                    .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
-                    .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
-                    .like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%")
-                    .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%")
-                    .orderByDesc("create_date");
-
             IPage<TaPerson> result = iTaPersonService.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentId);
             return ResponseBean.success(result);
     }

src/main/java/com/yunzhi/demo/vo/ChangePassword.java

@@ -0,0 +1,16 @@
+package com.yunzhi.demo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "修改密码参数")
+@Data
+public class ChangePassword {
+
+    @ApiModelProperty("原始密码, MD5 加密后数据")
+    String originPassword;
+
+    @ApiModelProperty("新密码, MD5 加密后数据")
+    String newPassword;
+}