diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java index 0889171..492ef94 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java @@ -14,11 +14,13 @@ import com.njcn.device.biz.pojo.po.Overlimit; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; /** * @author xy @@ -38,6 +40,10 @@ public interface CsLineFeignClient { @PostMapping("/findByNdid") HttpResult> findByNdid(@RequestParam("id") String id); + + @GetMapping("/getCustomDetailByLineId") + HttpResult> getCustomDetailByLineId(@RequestParam("id") String id); + @PostMapping("/getPositionById") HttpResult getPositionById(@RequestParam("id") String id); diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java index 3589831..ef270b8 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; /** * @author xy @@ -54,6 +55,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory> getCustomDetailByLineId(@RequestParam("id") String id) { + log.error("{}异常,降级处理,异常为:{}","根据id查询监测点",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult getPositionById(String id) { log.error("{}异常,降级处理,异常为:{}","通过id查询监测点位置",cause.toString()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index 30573f2..d754189 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Map; /** * Description: @@ -104,6 +105,17 @@ public class CslineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineList, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getCustomDetailByLineId") + @ApiOperation("根据id查询监测点") + public HttpResult> getCustomDetailByLineId(@RequestParam String id){ + String methodDescribe = getMethodDescribe("getCustomDetailByLineId"); + Map map = csLinePOService.getCustomDetailByLineId(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateLine") @ApiOperation("修改监测点信息") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java index ec7fb36..b30b576 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java @@ -5,6 +5,7 @@ import com.njcn.csdevice.pojo.po.CsLinePO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @@ -17,4 +18,7 @@ import java.util.List; public interface CsLinePOMapper extends BaseMapper { List findByNdid(@Param("id") String id); + + + Map getCustomDetailByLineId(@Param("lineId")String lineId); } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml index c8f49b2..e7f9ade 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml @@ -33,4 +33,22 @@ where t0.ndid = #{id} + + + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java index 448fc03..cdd27c1 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java @@ -10,6 +10,7 @@ import com.njcn.web.pojo.param.BaseParam; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; /** * @@ -39,6 +40,9 @@ public interface CsLinePOService extends IService{ */ List findByNdid(String id); + + Map getCustomDetailByLineId(String lineId); + /** * 更新监测点信息 * @param csLineParam diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 1d22723..7b264c9 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -105,6 +105,10 @@ public class CsLinePOServiceImpl extends ServiceImpl i return this.baseMapper.findByNdid(id); } + public Map getCustomDetailByLineId(String lineId){ + return this.baseMapper.getCustomDetailByLineId(lineId); + } + @Override public void updateLine(CsLineParam csLineParam) { LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/PqSensitiveUser.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/PqSensitiveUser.java index b27c514..168c6e7 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/PqSensitiveUser.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/PqSensitiveUser.java @@ -1,5 +1,6 @@ package com.njcn.csharmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Getter; @@ -7,6 +8,8 @@ import lombok.Setter; import java.io.Serializable; +import static com.baomidou.mybatisplus.annotation.IdType.ASSIGN_ID; + /** *

* @@ -25,6 +28,7 @@ public class PqSensitiveUser extends BaseEntity implements Serializable{ /** * id */ + @TableId(value = "id",type = ASSIGN_ID) private String id; /**