feats

src/main/java/com/example/civilizedcity/controller/SysLoginController.java

@@ -3,8 +3,9 @@ package com.example.civilizedcity.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
+
+import java.time.LocalDateTime;
 import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,36 +28,34 @@ public class SysLoginController extends BaseController {
     @Autowired
     private SysLoginService sysLoginService;
     
-    /** 
-     * 通过ID查询单条数据 
-     *
-     * @param loginId 主键
-     * @return 实例对象
-     */
-    @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/sysLogin/{id}")
-    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
-        return ResponseBean.success(sysLoginService.getById(id));
-    }
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param loginId 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/sysLogin/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+//        return ResponseBean.success(sysLoginService.getById(id));
+//    }
     
     /** 
      * 分页查询
      *
-     * @param pageNum 当前页码
-     * @param pageSize 每页条数
+     * @param userId 当前页码
      * @return 查询结果
      */
-    @ApiOperation("分页查询")
+    @ApiOperation("查询人员登录信息")
     @GetMapping("/sysLogin")
-    public ResponseBean list(@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 = sysLoginService.page(pg);
-        
-        return ResponseBean.success(result);
+    public ResponseBean list(@ApiParam("用户ID") @RequestParam(value ="userId") String userId) throws Exception {
+
+        SysLogin sysLogin = sysLoginService.getExistBy("user_id", userId, false, true);
+        if (null != sysLogin) {
+            sysLogin.setPassword(null);
+        }
+
+        return ResponseBean.success(sysLogin);
     }
     
     /** 
@@ -68,34 +67,51 @@ public class SysLoginController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysLogin")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysLogin sysLogin) throws Exception {
-        sysLoginService.save(sysLogin);
-        return ResponseBean.success(sysLogin);
-    }
-    
-    /** 
-     * 更新数据
-     *
-     * @param sysLogin 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/sysLogin/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysLogin sysLogin,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-        sysLoginService.updateById(sysLogin);
+
+        if (null == sysLogin.getLoginId()) {
+            // 新增
+            String password = EncryptUtils.md5(sysLogin.getPassword(), sysLogin.getUserId());
+            sysLogin.setPassword(password);
+            sysLogin.setStatus(Constants.STATUS_NORMAL);
+            sysLogin.setCreateDate(LocalDateTime.now());
+            sysLoginService.save(sysLogin);
+        } else {
+            // 更新
+            if (!StringUtils.isEmpty(sysLogin.getPassword())) {
+                String password = EncryptUtils.md5(sysLogin.getPassword(), sysLogin.getUserId());
+                sysLogin.setPassword(password);
+            }
+            sysLoginService.updateById(sysLogin);
+        }
+
+        sysLogin.setPassword(null);
         return ResponseBean.success(sysLogin);
     }
     
-    /** 
-     * 通过主键删除数据
-     *
-     * @param loginId 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/sysLogin/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        sysLoginService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 更新数据
+//     *
+//     * @param sysLogin 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/sysLogin/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody SysLogin sysLogin,
+//                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+//        sysLoginService.updateById(sysLogin);
+//        return ResponseBean.success(sysLogin);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param loginId 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/sysLogin/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+//        sysLoginService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

src/main/java/com/example/civilizedcity/entity/SysLogin.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class SysLogin implements Serializable,Cloneable{
     /** 登录ID */
     @ApiModelProperty(name = "登录ID",notes = "")
-    @TableId(value = "login_id", type = IdType.INPUT)
+    @TableId(value = "login_id", type = IdType.AUTO)
     private Integer loginId ;
     /** 机构ID */
     @ApiModelProperty(name = "机构ID",notes = "")