diff --git a/ghy-admin/pom.xml b/ghy-admin/pom.xml index d36994c3..0e64be68 100644 --- a/ghy-admin/pom.xml +++ b/ghy-admin/pom.xml @@ -91,6 +91,11 @@ ghy-custom + + com.ghy + ghy-worker + + diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java new file mode 100644 index 00000000..7a22dcc2 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -0,0 +1,46 @@ +package com.ghy.web.controller.worker; + +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.page.TableDataInfo; +import com.ghy.worker.domain.Worker; +import com.ghy.worker.service.WorkerService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +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.ResponseBody; + +import java.util.List; + +/** + * @author clunt + * 师傅端Controller + */ +@Controller +@RequestMapping("/worker") +public class WorkerController extends BaseController { + + private String prefix = "worker"; + + @Autowired + private WorkerService workerService; + + @RequiresPermissions("worker:worker:view") + @GetMapping() + public String worker(){ + return prefix + "/worker"; + } + + @RequiresPermissions("worker:worker:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Worker worker) + { + startPage(); + List list = workerService.getWorkList(worker); + return getDataTable(list); + } + +} diff --git a/ghy-admin/src/main/resources/templates/worker/worker.html b/ghy-admin/src/main/resources/templates/worker/worker.html new file mode 100644 index 00000000..e670e54a --- /dev/null +++ b/ghy-admin/src/main/resources/templates/worker/worker.html @@ -0,0 +1,210 @@ + + + + + + + + + +
+
+
+
+
+
+
    +
  • + 师傅名称： +
    • +
  • + 手机号码： +
    • +
  • + 公司归属： +
    • +
  • + 用户状态： +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + +
+
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerMapper.java b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerMapper.java index f722cc2b..5ca0cd0c 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerMapper.java +++ b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerMapper.java @@ -1,7 +1,15 @@ package com.ghy.worker.mapper; +import com.ghy.worker.domain.Worker; + +import java.util.List; + public interface WorkerMapper { - + /** + * @param worker 师傅端 + * @return 师傅集合 + */ + List getWorkerList(Worker worker); } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerService.java b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerService.java index 403724b7..9e418d42 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerService.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerService.java @@ -1,4 +1,16 @@ package com.ghy.worker.service; +import com.ghy.worker.domain.Worker; + +import java.util.List; + public interface WorkerService { + + /** + * @param worker 师傅 + * @return 师傅集合 + */ + List getWorkList(Worker worker); + + } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerServiceImpl.java index 4685877d..99b11df1 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerServiceImpl.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerServiceImpl.java @@ -1,11 +1,22 @@ package com.ghy.worker.service.impl; +import com.ghy.worker.domain.Worker; +import com.ghy.worker.mapper.WorkerMapper; import com.ghy.worker.service.WorkerService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class WorkerServiceImpl implements WorkerService { + @Autowired + private WorkerMapper workerMapper; + @Override + public List getWorkList(Worker worker) { + return workerMapper.getWorkerList(worker); + } } diff --git a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml deleted file mode 100644 index 44a41e35..00000000 --- a/ghy-worker/src/main/resources/mapper.worker/WorkerMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml new file mode 100644 index 00000000..afbbf2d1 --- /dev/null +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + SELECT + worker_id, name, account, phone, password, open_id, status, worker_logo_url, + leader_team_rate, leader_team_money, create_by, create_time, update_by, update_time, remark + FROM worker + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 95e13673..79a424e3 100644 --- a/pom.xml +++ b/pom.xml @@ -289,17 +289,17 @@ ${ghy.version} - + com.ghy ghy-custom ${ghy.version} - + com.ghy - ghy-payment + ghy-worker ${ghy.version}