Merge branch 'cuidi' into wheng

controller/src/main/java/com/koobietech/eas/controller/EasUserInfoController.java

@@ -0,0 +1,60 @@
+package com.koobietech.eas.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasSysUserinfo;
+import com.koobietech.eas.service.EasUserInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Tag(name = "用户信息模块")
+@RequestMapping("/userinfo")
+public class EasUserInfoController {
+
+    @Resource
+    EasUserInfoService easUserInfoService;
+
+    @PostMapping("/add")
+    @Operation(summary = "添加用户信息", description = "录入基本用户信息")
+    public JsonResult add(@RequestBody EasSysUserinfo userinfo) {
+        Boolean ret = easUserInfoService.add(userinfo);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用户信息",description = "删除用户信息表数据根据ID")
+    public JsonResult delete(@RequestParam Long id) {
+        Boolean ret = easUserInfoService.delete(id);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新用户信息",description = "更新用户信息表信息")
+    public JsonResult update(@RequestBody EasSysUserinfo userinfo) {
+        Boolean ret = easUserInfoService.update(userinfo);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @PostMapping("/query")
+    @Operation(summary = "查询用户信息",description = "查询用户信息表信息")
+    public JsonResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
+                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easUserInfoService.query(userinfo);
+        return JsonResult.data(ret);
+    }
+}

service/src/main/java/com/koobietech/eas/service/EasPermissionService.java

@@ -5,8 +5,8 @@ import com.koobietech.eas.mbg.model.EasSysPermission;
 
 public interface EasPermissionService {
 
-    Boolean update(EasSysPermission record);
-    Boolean add(EasSysPermission record);
+    Boolean update(EasSysPermission permisson);
+    Boolean add(EasSysPermission permisson);
     Boolean delete(Integer id);
     PageData query(EasSysPermission permission);
 }

service/src/main/java/com/koobietech/eas/service/EasUserInfoService.java

@@ -0,0 +1,15 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasSysUserinfo;
+
+public interface EasUserInfoService {
+
+    Boolean add(EasSysUserinfo userinfo);
+
+    Boolean delete(Long id);
+
+    Boolean update(EasSysUserinfo userinfo);
+
+    PageData query(EasSysUserinfo userinfo);
+}

service/src/main/java/com/koobietech/eas/service/impl/EasUserInfoServiceImpl.java

@@ -0,0 +1,103 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasSysUserinfoMapper;
+import com.koobietech.eas.mbg.model.EasSysUserinfo;
+import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
+import com.koobietech.eas.service.EasUserInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasUserInfoServiceImpl implements EasUserInfoService {
+
+    @Resource
+    EasSysUserinfoMapper easSysUserinfoMapper;
+
+    final String userInfoName = "admin";
+    @Override
+    public Boolean add(EasSysUserinfo userinfo) {
+        //给用户信息设置默认密码
+        userinfo.setPasswd("123456");
+        userinfo.setCreateTime(new Date());
+        userinfo.setModifyTime(new Date());
+        return easSysUserinfoMapper.insert(userinfo) == 1;
+    }
+
+    public EasSysUserinfo getUserById(Long id){
+        return easSysUserinfoMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public Boolean delete(Long id) {
+        //判断是否为admin用户信息，admin用户信息禁止删除
+        EasSysUserinfo userinfo = getUserById(id);
+        if ( userinfo.getUsername().equals(userInfoName) ) {
+            return false;
+        }
+        return easSysUserinfoMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public Boolean update(EasSysUserinfo userinfo) {
+        //判断是否为admin用户信息，admin用户信息中的Username禁止修改
+        EasSysUserinfo user = getUserById(userinfo.getId());
+        if ( user.getUsername().equals(userInfoName) ) {
+            userinfo.setUsername( user.getUsername() );
+        }
+        userinfo.setModifyTime(new Date());
+        return easSysUserinfoMapper.updateByPrimaryKey(userinfo) == 1;
+    }
+
+    @Override
+    public PageData query(EasSysUserinfo userinfo) {
+
+        EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
+        EasSysUserinfoExample.Criteria criteria = easSysUserinfoExample.createCriteria();
+        if(Objects.nonNull(userinfo)) {
+            if(Objects.nonNull(userinfo.getId())){
+                criteria.andIdEqualTo(userinfo.getId());
+            }
+
+            if(Objects.nonNull(userinfo.getPhone())){
+                criteria.andPhoneEqualTo(userinfo.getPhone());
+            }
+
+            if(Objects.nonNull(userinfo.getPasswd())){
+                criteria.andPasswdEqualTo(userinfo.getPasswd());
+            }
+
+            if(Objects.nonNull(userinfo.getEmail())){
+                criteria.andEmailEqualTo(userinfo.getEmail());
+            }
+
+            if(Objects.nonNull(userinfo.getRelname())){
+                criteria.andRelnameEqualTo(userinfo.getRelname());
+            }
+
+            if(Objects.nonNull(userinfo.getUsername())){
+                criteria.andUsernameEqualTo(userinfo.getUsername());
+            }
+
+            if(Objects.nonNull(userinfo.getAddress())){
+                criteria.andAddressEqualTo(userinfo.getAddress());
+            }
+
+            if(Objects.nonNull(userinfo.getCreateTime())){
+                criteria.andCreateTimeEqualTo(userinfo.getCreateTime());
+            }
+
+        }
+        List<EasSysUserinfo> easSysUserinfos = easSysUserinfoMapper.selectByExample(easSysUserinfoExample);
+        long l = easSysUserinfoMapper.countByExample(easSysUserinfoExample);
+        PageData ret = new PageData();
+        ret.setData(easSysUserinfos);
+        ret.setTotal(l);
+        return ret;
+    }
+}