diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java index 47c64ff..1af7fa9 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java @@ -3,8 +3,10 @@ package com.lyms.base.common.entity.region; import java.io.Serializable; import java.util.Date; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.google.gson.JsonObject; /** *

@@ -64,6 +66,8 @@ public class Regions implements Serializable { */ @TableField(value = "FOREIGN_ID") private String foreignId; + @TableField(exist = false) + private boolean isParent = true; public String getId() { return id; @@ -137,4 +141,15 @@ public class Regions implements Serializable { this.foreignId = foreignId; } + public boolean getIsParent() { + return isParent; + } + + public void setIsParent(boolean parent) { + isParent = parent; + } + + public static void main(String[] args) { + System.out.println(JSON.toJSONString(new Regions())); + } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java index f165f73..f2df1df 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.List; import com.lyms.base.common.entity.region.Regions; +import com.lyms.base.common.entity.sys.SysDict; import com.lyms.web.service.BaseService; /** @@ -36,4 +37,31 @@ public interface RegionsService extends BaseService { */ public List selectRegions(String id); + /** + *

  • @Description:添加一个地区 + *
  • @param dict + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年5月26日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean createRegion(Regions regions); + + public boolean updateRegion(Regions regions); + + + /** + *
  • @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/region/impl/RegionsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java index 8bb8249..a0dc70e 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java @@ -3,6 +3,8 @@ package com.lyms.base.common.service.region.impl; import java.io.Serializable; import java.util.List; +import com.lyms.base.common.entity.sys.SysDict; +import com.lyms.util.StrUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,4 +39,35 @@ public class RegionsServiceImpl extends ServiceImpl impl } return regionsMapper.selectRegionsById(id); } + + @Override + public boolean createRegion(Regions regions) { + if (StrUtils.isEmpty(regions.getId())) { + regions.setId(StrUtils.uuid()); + } + Integer tag = baseMapper.insert(regions); + return tag > 0; + } + + @Override + public boolean updateRegion(Regions regions) { + Integer tag = baseMapper.updateById(regions); + return tag > 0; + } + + @Override + public boolean disable(String id) { + Regions regions = new Regions(); + regions.setId(id); + regions.setEnable(0); + return baseMapper.updateById(regions) > 0; + } + + @Override + public boolean enable(String id) { + Regions regions = new Regions(); + regions.setId(id); + regions.setEnable(1); + return baseMapper.updateById(regions) > 0; + } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java index 5bca421..09c5300 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java @@ -2,10 +2,15 @@ package com.lyms.cm.controller.sys; import java.util.List; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.lyms.base.common.entity.sys.SysDict; +import com.lyms.constants.OperationName; +import com.lyms.web.bean.AjaxResult; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.region.Regions; @@ -20,13 +25,19 @@ import com.lyms.web.controller.BaseController; * @author maliang * @since 2017-03-08 */ -@RestController +@Controller @RequestMapping("/sysRegions") public class SysRegionsController extends BaseController { @Autowired private RegionsService regionService; + + @RequestMapping(value = "/toList", method = RequestMethod.GET) + public String toList(Model model) { + return "/region/region_list"; + } + /** *
  • @Description:获取区域信息 *
  • @return @@ -38,6 +49,7 @@ public class SysRegionsController extends BaseController { * @return */ @RequestMapping(value = "/find", method = RequestMethod.GET) + @ResponseBody public Page findRegions(String id) { Page page = getPage(); page.setSize(Integer.MAX_VALUE); @@ -46,4 +58,102 @@ public class SysRegionsController extends BaseController { return page; } + @RequestMapping(value = "/findById") + @ResponseBody + public List findById(String id) { + Page page = getPage(); + page.setSize(Integer.MAX_VALUE); + List regions = regionService.selectRegions(id); + return regions; + } + + + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(Regions regions, AjaxResult ajaxResult) { + boolean tag = regionService.createRegion(regions); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(Regions regions, AjaxResult ajaxResult) { + boolean tag = regionService.updateRegion(regions); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + + } + + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + String pid = RegionsService.NOT_PARENT_TAG; + if (!StringUtils.isBlank(id) & !"0".equals(id)) { + Regions regions = regionService.selectById(id); + model.addAttribute("regions", regions); + pid = regions.getParentId(); + } + EntityWrapper ew = new EntityWrapper(); + ew.where("ID={0}",pid); + ew.orderBy("enable", false); + List list = regionService.selectList(ew); + model.addAttribute("regionsList", list); + return "/region/region_edit"; + } + + /** + * 跳转到添加子字典 + * + * @return + */ + @RequestMapping(value = { "/{pid}/toAddSub" }, method = RequestMethod.GET) + public String toAddSub(@PathVariable String pid, Model model) { + EntityWrapper ew = new EntityWrapper(); + ew.where("ID={0}",pid); + ew.orderBy("enable", false); + List list = regionService.selectList(ew); + model.addAttribute("regionsList", list); + Regions regions = new Regions(); + regions.setParentId(pid); + model.addAttribute("regions", regions); + return "/region/region_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 = regionService.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 = regionService.enable(id); + return handleAjaxResult(ajaxResult, tag, OperationName.ENABLE); + } + } 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 index df80be4..5da10d0 100644 --- 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 @@ -67,7 +67,7 @@ function disable(){ var zTree = $.fn.zTree.getZTreeObj('dictTree'); var nodes = zTree.getSelectedNodes(); if(nodes.length > 0){ - layer.confirm('确定删除选中的数据', { + layer.confirm('确定禁用选中的数据', { btn: ['确定','取消'] //按钮 }, function(){ var url = APP.PATH + controllerRequestMappint + nodes[0]['id'] + "/disable"; diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/region/region_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/region/region_edit.html new file mode 100644 index 0000000..4a79b65 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/region/region_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/region/region_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/region/region_list.html new file mode 100644 index 0000000..fb2e623 --- /dev/null +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/region/region_list.html @@ -0,0 +1,128 @@ +#override("css") + +#end +#override("body") +
    +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    +
    +#end +#override("js") + + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/parent/hospital.mac/pom.xml b/parent/hospital.mac/pom.xml index b0690f9..279ec45 100644 --- a/parent/hospital.mac/pom.xml +++ b/parent/hospital.mac/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - + com.lyms parent 0.0.1-SNAPSHOT hospital.mac - + - + - + com.lyms @@ -25,5 +25,26 @@ 1.0 - + + + + src/main/resources + + **/*.properties + **/*.xml + **/*.tld + + false + + + src/main/java + + **/*.properties + **/*.xml + **/*.tld + + false + + + \ No newline at end of file