diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java new file mode 100644 index 00000000..43e77a45 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/SpecialSkillController.java @@ -0,0 +1,53 @@ +package com.ghy.web.controller.worker; + +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.core.text.Convert; +import com.ghy.worker.domain.SpecialSkill; +import com.ghy.worker.service.SpecialSkillService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 特殊技能 + * + * @author HH 2022/6/7 + */ +@Controller +@RequestMapping("special/skill") +public class SpecialSkillController { + + @Resource + private SpecialSkillService specialSkillService; + + @PostMapping("list") + @ResponseBody + public AjaxResult list(SpecialSkill specialSkill) { + return AjaxResult.success(specialSkillService.list(specialSkill)); + } + + @PostMapping("save") + @ResponseBody + public AjaxResult insert(@RequestBody SpecialSkill specialSkill) { + specialSkillService.insert(specialSkill); + return AjaxResult.success("保存成功"); + } + + @PutMapping("update") + @ResponseBody + public AjaxResult update(@RequestBody SpecialSkill specialSkill) { + specialSkillService.update(specialSkill); + return AjaxResult.success("修改成功"); + } + + @DeleteMapping("delete") + @ResponseBody + public AjaxResult delete(String ids) { + specialSkillService.delete(Convert.toLongArray(ids)); + return AjaxResult.success("保存成功"); + } + +} + + diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerSpecialSkillController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerSpecialSkillController.java new file mode 100644 index 00000000..f50245f2 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerSpecialSkillController.java @@ -0,0 +1,50 @@ +package com.ghy.web.controller.worker; + +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.core.text.Convert; +import com.ghy.worker.domain.WorkerSpecialSkill; +import com.ghy.worker.service.WorkerSpecialSkillService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 师傅的特殊技能 + * + * @author HH 2022/6/7 + */ +@Controller +@RequestMapping("worker/special/skill") +public class WorkerSpecialSkillController { + + @Resource + private WorkerSpecialSkillService workerSpecialSkillService; + + @PostMapping("{workerId}") + @ResponseBody + public AjaxResult getByWorker(@PathVariable Long workerId) { + return AjaxResult.success(workerSpecialSkillService.getByWorker(workerId)); + } + + @PostMapping("save") + @ResponseBody + public AjaxResult insert(@RequestBody WorkerSpecialSkill workerSpecialSkill) { + workerSpecialSkillService.insert(workerSpecialSkill); + return AjaxResult.success("保存成功"); + } + + @DeleteMapping + @ResponseBody + public AjaxResult delete(String ids) { + workerSpecialSkillService.delete(Convert.toLongArray(ids)); + return AjaxResult.success("保存成功"); + } + + @DeleteMapping("{workerId}") + @ResponseBody + public AjaxResult deleteByWorker(@PathVariable Long workerId) { + workerSpecialSkillService.deleteByWorker(workerId); + return AjaxResult.success("保存成功"); + } +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java index c803dd16..06369d89 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSpecialSkill.java @@ -5,6 +5,11 @@ import lombok.Data; import java.time.LocalDate; +/** + * 师傅特殊技能关系表 + * + * @author HH 2022/6/7 + */ @Data public class WorkerSpecialSkill extends BaseEntity { diff --git a/ghy-worker/src/main/java/com/ghy/worker/mapper/SpecialSkillMapper.java b/ghy-worker/src/main/java/com/ghy/worker/mapper/SpecialSkillMapper.java index 25260333..5a39e072 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/mapper/SpecialSkillMapper.java +++ b/ghy-worker/src/main/java/com/ghy/worker/mapper/SpecialSkillMapper.java @@ -2,6 +2,8 @@ package com.ghy.worker.mapper; import com.ghy.worker.domain.SpecialSkill; +import java.util.List; + /** * 特殊技能Mapper * @@ -14,4 +16,6 @@ public interface SpecialSkillMapper { int delete(Long[] ids); int update(SpecialSkill specialSkill); + + List list(SpecialSkill specialSkill); } diff --git a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerSpecialSkillMapper.java b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerSpecialSkillMapper.java index 90ac3621..e741e192 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerSpecialSkillMapper.java +++ b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerSpecialSkillMapper.java @@ -1,6 +1,6 @@ package com.ghy.worker.mapper; -import com.ghy.worker.domain.WorkerArea; +import com.ghy.worker.domain.WorkerSpecialSkill; import java.util.List; @@ -11,11 +11,11 @@ import java.util.List; */ public interface WorkerSpecialSkillMapper { - int insert(WorkerArea workerArea); + int insert(WorkerSpecialSkill workerArea); int delete(Long[] ids); int deleteByWorker(Long workerId); - List getByWorker(Long workerId); + List getByWorker(Long workerId); } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/SpecialSkillService.java b/ghy-worker/src/main/java/com/ghy/worker/service/SpecialSkillService.java new file mode 100644 index 00000000..fcd59421 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/SpecialSkillService.java @@ -0,0 +1,21 @@ +package com.ghy.worker.service; + +import com.ghy.worker.domain.SpecialSkill; + +import java.util.List; + +/** + * 特殊技能Service + * + * @author HH 2022/6/7 + */ +public interface SpecialSkillService { + + int insert(SpecialSkill specialSkill); + + int delete(Long[] ids); + + int update(SpecialSkill specialSkill); + + List list(SpecialSkill specialSkill); +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerSpecialSkillService.java b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerSpecialSkillService.java new file mode 100644 index 00000000..83f1b2eb --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerSpecialSkillService.java @@ -0,0 +1,22 @@ +package com.ghy.worker.service; + +import com.ghy.worker.domain.WorkerSpecialSkill; + +import java.util.List; + +/** + * 师傅特殊技能Service + * + * @author HH 2022/6/7 + */ +public interface WorkerSpecialSkillService { + + int insert(WorkerSpecialSkill workerArea); + + int delete(Long[] ids); + + int deleteByWorker(Long workerId); + + List getByWorker(Long workerId); + +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/SpecialSkillServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/SpecialSkillServiceImpl.java new file mode 100644 index 00000000..954ad00f --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/SpecialSkillServiceImpl.java @@ -0,0 +1,41 @@ +package com.ghy.worker.service.impl; + +import com.ghy.worker.domain.SpecialSkill; +import com.ghy.worker.mapper.SpecialSkillMapper; +import com.ghy.worker.service.SpecialSkillService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 特殊技能Service + * + * @author HH 2022/6/7 + */ +@Service +public class SpecialSkillServiceImpl implements SpecialSkillService { + + @Resource + private SpecialSkillMapper specialSkillMapper; + + @Override + public int insert(SpecialSkill specialSkill) { + return specialSkillMapper.insert(specialSkill); + } + + @Override + public int delete(Long[] ids) { + return specialSkillMapper.delete(ids); + } + + @Override + public int update(SpecialSkill specialSkill) { + return specialSkillMapper.update(specialSkill); + } + + @Override + public List list(SpecialSkill specialSkill) { + return specialSkillMapper.list(specialSkill); + } +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerSpecialSkillServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerSpecialSkillServiceImpl.java new file mode 100644 index 00000000..560b36b6 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerSpecialSkillServiceImpl.java @@ -0,0 +1,41 @@ +package com.ghy.worker.service.impl; + +import com.ghy.worker.domain.WorkerSpecialSkill; +import com.ghy.worker.mapper.WorkerSpecialSkillMapper; +import com.ghy.worker.service.WorkerSpecialSkillService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 师傅特殊技能Service + * + * @author HH 2022/6/7 + */ +@Service +public class WorkerSpecialSkillServiceImpl implements WorkerSpecialSkillService { + + @Resource + private WorkerSpecialSkillMapper workerSpecialSkillMapper; + + @Override + public int insert(WorkerSpecialSkill workerArea) { + return workerSpecialSkillMapper.insert(workerArea); + } + + @Override + public int delete(Long[] ids) { + return workerSpecialSkillMapper.delete(ids); + } + + @Override + public int deleteByWorker(Long workerId) { + return workerSpecialSkillMapper.deleteByWorker(workerId); + } + + @Override + public List getByWorker(Long workerId) { + return workerSpecialSkillMapper.getByWorker(workerId); + } +} diff --git a/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml b/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml index 6db4f5e8..a5116ec2 100644 --- a/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/SpecialSkillMapper.xml @@ -24,7 +24,7 @@ create_time )VALUES( #{specialSkillName}, - #{provinceId}, + #{goodsCategoryId}, #{dangerous}, #{createBy}, #{remark}, @@ -36,7 +36,7 @@ UPDATE special_skill special_skill_name = #{specialSkillName}, - goods_category_id = #{provinceId}, + goods_category_id = #{goodsCategoryId}, dangerous = #{dangerous}, remark = #{remark}, create_time = sysdate() @@ -50,4 +50,13 @@ + +