diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/sys/SysDict.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/sys/SysDict.java index d2bd1a1..58815bf 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/sys/SysDict.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/sys/SysDict.java @@ -43,6 +43,8 @@ public class SysDict implements Serializable { */ @TableField(value="ENABLE") private Integer enable; + @TableField(exist=false) + private String txtAndEnable; public String getId() { @@ -85,4 +87,17 @@ public class SysDict implements Serializable { this.enable = enable; } + public String getTxtAndEnable() { + StringBuilder sb = new StringBuilder(); + sb.append(getTxt()); + if(this.getEnable() == 0){ + sb.append("(已禁用)"); + } + return sb.toString(); + } + + public void setTxtAndEnable(String txtAndEnable) { + this.txtAndEnable = txtAndEnable; + } + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/sys/SysDictService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/sys/SysDictService.java index c8133a0..594728c 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/sys/SysDictService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/sys/SysDictService.java @@ -43,5 +43,32 @@ public interface SysDictService extends BaseService { *
  • 修改时间： */ public String getDictNameById(String id); + + /** + *
  • @Description:添加一个字典 + *
  • @param dict + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月26日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean createDict(SysDict dict); + + public boolean updateDict(SysDict dict); + + + /** + *
  • @Description:禁用 + *
  • @param id + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月26日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean disable(String id); + + public boolean enable(String id); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/sys/impl/SysDictServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/sys/impl/SysDictServiceImpl.java index 9a38fc7..92243bf 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/sys/impl/SysDictServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/sys/impl/SysDictServiceImpl.java @@ -3,6 +3,7 @@ package com.lyms.base.common.service.sys.impl; import com.lyms.base.common.entity.sys.SysDict; import com.lyms.base.common.dao.sys.SysDictMapper; import com.lyms.base.common.service.sys.SysDictService; +import com.lyms.util.StrUtils; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.io.Serializable; @@ -18,19 +19,50 @@ import java.util.List; */ @Service public class SysDictServiceImpl extends ServiceImpl implements SysDictService { - - public Integer deleteLogicById(Serializable id){ - return baseMapper.deleteLogicById(id); - } + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } @Override public List getDictListByTypeCode(Serializable typeCode) { - return baseMapper.getDictListByTypeCode(typeCode); + return baseMapper.getDictListByTypeCode(typeCode); + } + + @Override + public String getDictNameById(String id) { + SysDict dic = baseMapper.selectById(id); + return dic == null ? null : dic.getTxt(); + } + + @Override + public boolean createDict(SysDict dict) { + if (StrUtils.isEmpty(dict.getId())) { + dict.setId(StrUtils.uuid()); + } + Integer tag = baseMapper.insert(dict); + return tag > 0; } - @Override - public String getDictNameById(String id) { - SysDict dic = baseMapper.selectById(id); - return dic==null?null:dic.getTxt(); - } + @Override + public boolean updateDict(SysDict dict) { + Integer tag = baseMapper.updateById(dict); + return tag > 0; + } + + @Override + public boolean disable(String id) { + SysDict dict = new SysDict(); + dict.setId(id); + dict.setEnable(0); + return baseMapper.updateById(dict) > 0; + } + + @Override + public boolean enable(String id) { + SysDict dict = new SysDict(); + dict.setId(id); + dict.setEnable(1); + return baseMapper.updateById(dict) > 0; + } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDictController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDictController.java new file mode 100644 index 0000000..a0823b1 --- /dev/null +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDictController.java @@ -0,0 +1,168 @@ +package com.lyms.cm.controller.sys; + +import java.util.List; +import java.util.Map; + +import com.lyms.base.common.entity.sys.SysDict; +import com.lyms.base.common.service.sys.SysDictService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.entity.role.Roles; +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.base.common.entity.user.SysUserDataPermissions; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.service.organ.DepartmentsService; +import com.lyms.base.common.service.organ.OrganizationsService; +import com.lyms.base.common.service.role.RolesService; +import com.lyms.base.common.service.role.UserRoleMapsService; +import com.lyms.base.common.service.user.SysUserDataPermissionsService; +import com.lyms.base.common.service.user.UsersService; +import com.lyms.constants.OperationName; +import com.lyms.util.InstanceUtils; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; +import com.lyms.web.controller.BaseController; + +/** + *

    + * 字典 前端控制器 + *

    + * + * @author maliang + * @since 2017-03-02 + */ +@Controller +@RequestMapping("/sysDict") +public class SysDictController extends BaseController { + + @Autowired + private SysDictService sysDictService; + + /** + * 跳转到字典列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = {RequestMethod.GET}) + public String toList(Model model) { + EntityWrapper ew = new EntityWrapper(); + ew.orderBy("enable", false); + List list = sysDictService.selectList(ew); + model.addAttribute("dictString", JSON.toJSONString(list)); + return "/dict/dict_list"; + } + + /** + * 字典列表 + * + * @param model + * @return + */ + @RequestMapping(value = "/list", method = {RequestMethod.POST, RequestMethod.GET}) + @ResponseBody + public Map list(Model model) { + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); + ew.where("pid=0").and("enable=1"); + page = sysDictService.selectPage(page, ew); + return toGridData(page); + } + + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(SysDict sysDict, AjaxResult ajaxResult) { + boolean tag = sysDictService.createDict(sysDict); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(SysDict sysDict, AjaxResult ajaxResult) { + boolean tag = sysDictService.updateDict(sysDict); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + + } + + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + if (!StringUtils.isBlank(id) & !"0".equals(id)) { + SysDict dict = sysDictService.selectById(id); + model.addAttribute("dict", dict); + } + EntityWrapper ew = new EntityWrapper(); + ew.orderBy("enable", false); + List list = sysDictService.selectList(ew); + model.addAttribute("dictList", list); + return "/dict/dict_edit"; + } + + /** + * 跳转到添加子字典 + * + * @return + */ + @RequestMapping(value = { "/{pid}/toAddSub" }, method = RequestMethod.GET) + public String toAddSub(@PathVariable String pid, Model model) { + EntityWrapper ew = new EntityWrapper(); + ew.orderBy("enable", false); + List list = sysDictService.selectList(ew); + model.addAttribute("dictList", list); + SysDict dict = new SysDict(); + dict.setPid(pid); + model.addAttribute("dict", dict); + return "/dict/dict_edit"; + } + + /** + *
  • @Description:禁用字典 + *
  • @param id + *
  • @param ajaxResult + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月26日 + *
  • 修改人： + *
  • 修改时间： + */ + @RequestMapping(value = "/{id}/disable", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult disable(@PathVariable String id, AjaxResult ajaxResult) { + boolean tag = sysDictService.disable(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DISABLE); + } + + /** + *
  • @Description:禁用字典 + *
  • @param id + *
  • @param ajaxResult + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月26日 + *
  • 修改人： + *
  • 修改时间： + */ + @RequestMapping(value = "/{id}/enable", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult enable(@PathVariable String id, AjaxResult ajaxResult) { + boolean tag = sysDictService.enable(id); + return handleAjaxResult(ajaxResult, tag, OperationName.ENABLE); + } + + +} diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_edit.html new file mode 100644 index 0000000..947e093 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_edit.html @@ -0,0 +1,92 @@ +#override("css") + +#end +#override("body") +
    +
    +
    +
    + +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_list.html new file mode 100644 index 0000000..df80be4 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/dict/dict_list.html @@ -0,0 +1,123 @@ +#override("css") + +#end +#override("body") +
    +
    +
    +
    + + + + + + +
    +
    + +
    +
    +
    +
    +#end +#override("js") + + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/parent/core.sdk/src/main/java/com/lyms/constants/OperationName.java b/parent/core.sdk/src/main/java/com/lyms/constants/OperationName.java index 86e27d3..6e1cbc5 100644 --- a/parent/core.sdk/src/main/java/com/lyms/constants/OperationName.java +++ b/parent/core.sdk/src/main/java/com/lyms/constants/OperationName.java @@ -7,5 +7,9 @@ public interface OperationName { String UPDATE = "修改"; String DELETE = "删除"; + + String DISABLE = "禁用"; + + String ENABLE = "启用"; }