diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java index b65024a..21ff0e3 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java @@ -5,6 +5,7 @@ import com.lideeyunji.core.framework.service.IByglByfaService; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import com.lideeyunji.tool.framework.constants.FrameErrorCodeConstants; import com.lideeyunji.tool.framework.yunji.model.global.BaseWebResult; +import com.lideeyunji.tool.framework.yunji.utils.FuncBase; import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; +import java.util.List; import java.util.Map; @Tag(name = "保养管理-保养方案") @@ -36,4 +39,20 @@ public class ByglController extends BaseController { } + @PostMapping("/getByWxXx") + public BaseWebResult getByWxXx(@RequestBody Map model) { + String dev_code = lideeYunJiUtils.getMap2Str(model, "dev_code"); + String dev_type = lideeYunJiUtils.getMap2Str(model, "dev_type"); + if (FuncBase.isEmpty(dev_code) || FuncBase.isEmpty(dev_type)) { + return BaseWebResult.successNull(); + } + List> by = byglByfaService.getByXx(dev_type, dev_code); + List> wx = byglByfaService.getWxXx(dev_type, dev_code); + Map>> map = new HashMap<>(); + map.put("by",by); + map.put("wx",wx); + return BaseWebResult.success(map); + } + + } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/ByglByfaMapper.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/ByglByfaMapper.java index 6f19a2e..ce19df2 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/ByglByfaMapper.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/ByglByfaMapper.java @@ -3,6 +3,9 @@ package com.lideeyunji.core.framework.mapper; import com.baomidou.dynamic.datasource.annotation.Master; +import java.util.List; +import java.util.Map; + /** *保养管理-保养方案 */ @@ -10,4 +13,8 @@ import com.baomidou.dynamic.datasource.annotation.Master; public interface ByglByfaMapper { int changeFaState(String id, String state); + + List> getByXx(String dev_type, String dev_code); + + List> getWxXx(String dev_type, String dev_code); } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IByglByfaService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IByglByfaService.java index d96685d..6ef6dc0 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IByglByfaService.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/IByglByfaService.java @@ -1,10 +1,17 @@ package com.lideeyunji.core.framework.service; +import java.util.List; +import java.util.Map; + /** * 保养管理-保养方案 */ public interface IByglByfaService { int changeFaState(String id, String state); + + List> getByXx(String dev_type, String dev_code); + + List> getWxXx(String dev_type, String dev_code); } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java index e1b84e4..ffc15ee 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java @@ -7,6 +7,9 @@ import com.lideeyunji.core.framework.service.IByglByfaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** *保养管理-保养方案 */ @@ -21,4 +24,16 @@ public class ByglByfaServiceImpl implements IByglByfaService { int result = byglByfaMapper.changeFaState(id, state); return result; } + + @Override + public List> getByXx(String dev_type, String dev_code) { + + return byglByfaMapper.getByXx(dev_type, dev_code); + } + + @Override + public List> getWxXx(String dev_type, String dev_code) { + + return byglByfaMapper.getWxXx(dev_type, dev_code); + } } diff --git a/lidee-core/src/main/resources/mapper/bygl/ByglByfaMapper.xml b/lidee-core/src/main/resources/mapper/bygl/ByglByfaMapper.xml index 3fb5dd8..c3ab81a 100644 --- a/lidee-core/src/main/resources/mapper/bygl/ByglByfaMapper.xml +++ b/lidee-core/src/main/resources/mapper/bygl/ByglByfaMapper.xml @@ -5,4 +5,27 @@ update by_management_fa set state = #{state} where id = #{id} + + + + + + +