diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java index bcb69d2..7079f51 100644 --- a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java +++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/service/BaseCateService.java @@ -21,6 +21,16 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) public abstract class BaseCateService { + public List findTreeList(String table,String name) { + Sqler sqler = new Sqler(table); + sqler.addSelect("t.pid"); + sqler.addLike("t.name", name); + sqler.addOrder("t.ornum"); + List list = jdbcDao.findTreeList(sqler); + return list; + } + + @Transactional(readOnly = true) public PageData findPageData(Sqler sqler) { sqler.selectCUinfo().addSelect("t.label"); diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/WfTestApi.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/WfTestApi.java deleted file mode 100644 index c2843e7..0000000 --- a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/WfTestApi.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zsvg.vboot.wf; - -import com.zsvg.vboot.common.mvc.api.RestResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("wf") -public class WfTestApi { - - @GetMapping("test") - public RestResult get() { - return RestResult.ok("这里可以放扩展模块"); - } - -} \ No newline at end of file diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCate.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCate.java new file mode 100644 index 0000000..c10a9b2 --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCate.java @@ -0,0 +1,22 @@ +package com.zsvg.vboot.wf.tem.cate; + +import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +@Entity +@Getter +@Setter +public class WfTemCate extends BaseCateEntity { + + @ManyToOne(fetch= FetchType.EAGER) + @JoinColumn(name = "pid") + private WfTemCate parent;//父类别 + + private String notes;//备注 +} diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateApi.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateApi.java new file mode 100644 index 0000000..65a2f69 --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateApi.java @@ -0,0 +1,55 @@ +package com.zsvg.vboot.wf.tem.cate; + +import com.zsvg.vboot.common.mvc.api.RestResult; +import com.zsvg.vboot.common.mvc.dao.Sqler; +import com.zsvg.vboot.common.mvc.pojo.Ztree; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("wf/tem/cate") +public class WfTemCateApi { + + private String table = "wf_tem_cate"; + + @GetMapping + public RestResult get(String name) { + Sqler sqler = new Sqler(table); + sqler.addLike("t.name", name); + sqler.addSelect("t.notes,t.ornum"); + return RestResult.ok(service.findPageData(sqler)); + } + + @GetMapping("one/{id}") + public RestResult getOne(@PathVariable String id) { + WfTemCate cate = service.findOne(id); + return RestResult.ok(cate); + } + + @GetMapping("tree") + public RestResult getTree(String name) { + List list = service.findTreeList(table,name); + return RestResult.ok(list); + } + + @PostMapping + public RestResult post(@RequestBody WfTemCate main) { + return RestResult.ok(service.insert(main)); + } + + @PutMapping + public RestResult put(@RequestBody WfTemCate main) { + return RestResult.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public RestResult delete(@PathVariable String[] ids) { + return RestResult.ok(service.delete(ids)); + } + + @Autowired + private WfTemCateService service; + +} diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateRepo.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateRepo.java new file mode 100644 index 0000000..6508b6b --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.wf.tem.cate; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface WfTemCateRepo extends JpaRepository { + + +} diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateService.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateService.java new file mode 100644 index 0000000..26e3cea --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/cate/WfTemCateService.java @@ -0,0 +1,27 @@ +package com.zsvg.vboot.wf.tem.cate; + +import com.zsvg.vboot.common.mvc.service.BaseCateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; + +@Service +public class WfTemCateService extends BaseCateService { + + + + + + + //----------bean注入------------ + @Autowired + private WfTemCateRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } + + +} diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMain.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMain.java new file mode 100644 index 0000000..756cab6 --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMain.java @@ -0,0 +1,22 @@ +package com.zsvg.vboot.wf.tem.main; + +import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Column; +import javax.persistence.Entity; + +@Entity +@Getter +@Setter +public class WfTemMain extends BaseMainEntity { + + private String notes; + + @Column(length = 32) + private String code;//编码 + + private Integer ornum; + +} \ No newline at end of file diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainApi.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainApi.java new file mode 100644 index 0000000..ecd4f63 --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainApi.java @@ -0,0 +1,47 @@ +package com.zsvg.vboot.wf.tem.main; + +import com.zsvg.vboot.common.mvc.api.RestResult; +import com.zsvg.vboot.common.mvc.dao.Sqler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +@RestController +@RequestMapping("wf/tem/main") +public class WfTemMainApi { + + private String table = "wf_tem_main"; + + @GetMapping + public RestResult get(String name) { + Sqler sqler = new Sqler(table); + sqler.addLike("t.name", name); + sqler.addSelect("t.notes,t.ornum,t.code"); + return RestResult.ok(service.findPageData(sqler)); + } + + @GetMapping("one/{id}") + public RestResult getOne(@PathVariable String id) { + WfTemMain main = service.findOne(id); + return RestResult.ok(main); + } + + @PostMapping + public RestResult post(@RequestBody WfTemMain main) { + return RestResult.ok(service.insert(main)); + } + + @PutMapping + public RestResult put(@RequestBody WfTemMain main) { + return RestResult.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public RestResult delete(@PathVariable String[] ids) { + return RestResult.ok(service.delete(ids)); + } + + @Autowired + private WfTemMainService service; + +} diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainRepo.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainRepo.java new file mode 100644 index 0000000..4d7f7ce --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainRepo.java @@ -0,0 +1,9 @@ +package com.zsvg.vboot.wf.tem.main; + +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface WfTemMainRepo extends JpaRepository { + +} + diff --git a/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainService.java b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainService.java new file mode 100644 index 0000000..dac59af --- /dev/null +++ b/vboot-extend-wf/src/main/java/com/zsvg/vboot/wf/tem/main/WfTemMainService.java @@ -0,0 +1,31 @@ +package com.zsvg.vboot.wf.tem.main; + +import com.zsvg.vboot.common.mvc.service.BaseMainService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; + + +@Service +public class WfTemMainService extends BaseMainService { + + + + + + + + + //----------bean注入------------ + @Autowired + private WfTemMainRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } + + +} +