diff --git a/src/main/java/com/govmade/modules/system/controller/DepartController.java b/src/main/java/com/govmade/modules/system/controller/DepartController.java new file mode 100644 index 0000000000000000000000000000000000000000..34a8f628d884a6bb7c2916a343df00ef68378452 --- /dev/null +++ b/src/main/java/com/govmade/modules/system/controller/DepartController.java @@ -0,0 +1,71 @@ +package com.govmade.modules.system.controller; + +import java.util.Map; +import java.util.Set; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.govmade.common.utils.PageUtils; +import com.govmade.common.utils.R; +import com.govmade.modules.basic.controller.AbstractController; +import com.govmade.modules.system.entity.DepartEntity; +import com.govmade.modules.system.service.DepartService; + +/** + * ç³»ç»Ÿç®¡ç† - 部门设置 + * + * @author 刘弈臻 + * @date 2018å¹´8月8æ—¥ + */ +@RestController +@RequestMapping("/system/depart") +public class DepartController extends AbstractController{ + + @Autowired + private DepartService departService; + + /** + * 部门列表 + */ + @GetMapping("/list") + public R list(@RequestParam Map<String, Object> params) { + + PageUtils page = departService.queryPage(params); + return R.ok().put("page", page); + } + + /** + * ä¿å˜æˆ–更新部门 + */ + @PostMapping("/save") + public R save(DepartEntity depart) { + + if (null == depart.getId()) { + if (this.departService.checkDepart(depart.getName()) > 0) { + return R.error(depart.getName() + " å·²å˜åœ¨!"); + } + + } + departService.save(depart); + return R.ok(); + } + + + /** + * åˆ é™¤æˆ–æ‰¹é‡åˆ 除角色 + */ + @DeleteMapping("/delete") + public R deleteDepart(@RequestParam Set<Long> ids) { + + departService.deleteBatchIds(ids); + return R.ok(); + } + + +} diff --git a/src/main/java/com/govmade/modules/system/controller/RoleController.java b/src/main/java/com/govmade/modules/system/controller/RoleController.java index a804f332c038466bf28a9089e9eebbb19052542b..61e8325b77c2bd457900be1089e8f97ecec21e12 100644 --- a/src/main/java/com/govmade/modules/system/controller/RoleController.java +++ b/src/main/java/com/govmade/modules/system/controller/RoleController.java @@ -42,7 +42,7 @@ public class RoleController extends AbstractController{ } /** - * ä¿å˜æˆ–æ›´æ–°æƒé™ + * ä¿å˜æˆ–更新角色 */ @PostMapping("/save") public R save(RoleEntity role) { diff --git a/src/main/java/com/govmade/modules/system/dao/DepartDao.java b/src/main/java/com/govmade/modules/system/dao/DepartDao.java new file mode 100644 index 0000000000000000000000000000000000000000..f7e097ab580e64dcc3feb030d423bf4314707f03 --- /dev/null +++ b/src/main/java/com/govmade/modules/system/dao/DepartDao.java @@ -0,0 +1,17 @@ +package com.govmade.modules.system.dao; + +import org.apache.ibatis.annotations.Mapper; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.govmade.modules.system.entity.DepartEntity; + +/** + * ç³»ç»Ÿç®¡ç† - 部门设置 + * + * @author 刘弈臻 + * @date 2018å¹´8月8æ—¥ + */ +@Mapper +public interface DepartDao extends BaseMapper<DepartEntity>{ + +} diff --git a/src/main/java/com/govmade/modules/system/entity/DepartEntity.java b/src/main/java/com/govmade/modules/system/entity/DepartEntity.java new file mode 100644 index 0000000000000000000000000000000000000000..0e59b422f8da932bed9de8ce7b9a0a7c16df0c09 --- /dev/null +++ b/src/main/java/com/govmade/modules/system/entity/DepartEntity.java @@ -0,0 +1,80 @@ +package com.govmade.modules.system.entity; + +import com.baomidou.mybatisplus.annotations.TableName; +import com.govmade.modules.basic.entity.BaseEntity; + +/** + * ç³»ç»Ÿç®¡ç† - 部门设置 + * + * @author 刘弈臻 + * @date 2018å¹´8月8æ—¥ + */ +@TableName("system_departs") +public class DepartEntity extends BaseEntity<Long>{ + + private static final long serialVersionUID = 1L; + + private String code; //机构编ç + + private String name; //部门åç§° + + private Long areaId; //所属行政区划 + + private Integer type; //机构类别 + + private Integer level; //层级 + + private Long weight; //æƒé‡ + + + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public Long getWeight() { + return weight; + } + + public void setWeight(Long weight) { + this.weight = weight; + } + + +} diff --git a/src/main/java/com/govmade/modules/system/service/DepartService.java b/src/main/java/com/govmade/modules/system/service/DepartService.java new file mode 100644 index 0000000000000000000000000000000000000000..d9942ce15325c79deb4bc04f8a0ae67c7910a504 --- /dev/null +++ b/src/main/java/com/govmade/modules/system/service/DepartService.java @@ -0,0 +1,37 @@ +package com.govmade.modules.system.service; + +import java.util.Map; + +import com.baomidou.mybatisplus.service.IService; +import com.govmade.common.utils.PageUtils; +import com.govmade.modules.system.entity.DepartEntity; + +/** + * ç³»ç»Ÿç®¡ç† - 部门设置 + * + * @author 刘弈臻 + * @date 2018å¹´8月8æ—¥ + */ +public interface DepartService extends IService<DepartEntity>{ + + /** + * 查看部门列表 + */ + PageUtils queryPage(Map<String, Object> params); + + /** + * ä¿å˜æˆ–修改部门 + */ + void save(DepartEntity depart); + + /** + * åˆ é™¤éƒ¨é—¨ + */ + void deleteBatch(Long[] roleIds); + + + /** + * éƒ¨é—¨æŸ¥é‡ + */ + Integer checkDepart(String name); +} diff --git a/src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java b/src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..0ab80e3f2d6d63e1b9021f1104f88a508dd0a2b3 --- /dev/null +++ b/src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java @@ -0,0 +1,54 @@ +package com.govmade.modules.system.service.impl; + +import java.util.Map; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.govmade.common.utils.PageUtils; +import com.govmade.common.utils.Query; +import com.govmade.modules.system.dao.DepartDao; +import com.govmade.modules.system.entity.DepartEntity; +import com.govmade.modules.system.service.DepartService; + +import cn.hutool.core.util.StrUtil; + + +/** + * ç³»ç»Ÿç®¡ç† - 部门设置 + * + * @author 刘弈臻 + * @date 2018å¹´8月8æ—¥ + */ +@Service("DepartService") +public class DepartServiceImpl extends ServiceImpl<DepartDao,DepartEntity> implements DepartService{ + + @Override + public PageUtils queryPage(Map<String, Object> params) { + + String name = (String) params.get("name"); + Page<DepartEntity> page = this.selectPage(new Query<DepartEntity>(params).getPage(), + new EntityWrapper<DepartEntity>() + .like(StrUtil.isNotBlank(name), "name", name)); + return new PageUtils(page); + } + + + @Override + public void save(DepartEntity depart) { + super.insertOrUpdate(depart); + } + + @Override + public void deleteBatch(Long[] roleIds) { + // TODO Auto-generated method stub + } + + @Override + public Integer checkDepart(String name) { + return super.selectCount(new EntityWrapper<DepartEntity>().eq("name",name)); + } + +} diff --git a/src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java b/src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java index cba37da6718dead7c889c691b7cedece0ce85bd2..8824d8e9b127e0d4fe02f52d3d80e0f1d6146d72 100644 --- a/src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java @@ -28,8 +28,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, RoleEntity> implements public PageUtils queryPage(Map<String, Object> params) { String name = (String) params.get("name"); - Page<RoleEntity> page = this.selectPage(new Query<RoleEntity>(params).getPage(), new EntityWrapper<RoleEntity>() - .eq(StrUtil.isNotBlank(name), "name", name)); + Page<RoleEntity> page = this.selectPage(new Query<RoleEntity>(params).getPage(), + new EntityWrapper<RoleEntity>() + .like(StrUtil.isNotBlank(name), "name", name)); return new PageUtils(page); }