| dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| dao/src/main/resources/mapper/C3mReportErrorMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,14 @@ package com.sandu.ximon.dao.bo; import com.sandu.ximon.dao.domain.C3mReportError; import lombok.Data; /** * @author ZZQ * @date 2022/7/27 16:52 */ @Data public class C3ReportErrorBo extends C3mReportError { private String poleId; private String poleName; } dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java
@@ -1,8 +1,11 @@ package com.sandu.ximon.dao.mapper; import com.sandu.ximon.dao.bo.C3ReportErrorBo; import com.sandu.ximon.dao.domain.C3mReportError; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * @author Administrator @@ -13,6 +16,7 @@ @Mapper public interface C3mReportErrorMapper extends BaseMapper<C3mReportError> { List<C3ReportErrorBo> listReportError(Long userid); } dao/src/main/resources/mapper/C3mReportErrorMapper.xml
@@ -12,5 +12,23 @@ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/> </resultMap> <select id="listReportError" resultType="com.sandu.ximon.dao.bo.C3ReportErrorBo"> SELECT t1.*, t4.pole_name as pole_name, t4.id as pole_id FROM c3m_report_error t1 LEFT JOIN c3m_charging t2 ON t1.c3_mac = t2.c3_mac LEFT JOIN pole_binding t3 ON t2.mcu_udid = t3.device_code AND t3.device_type = 2 LEFT JOIN pole t4 ON t4.id = t3.pole_id <where> <if test="userid != null"> AND (t4.user_id = #{userid} OR t4.client_id = #{userid}) </if> </where> </select> </mapper> ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java
@@ -1,6 +1,11 @@ package com.sandu.ximon.admin.controller; import com.sandu.common.domain.ResponseVO; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.service.C3mReportErrorService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,4 +17,11 @@ @AllArgsConstructor @RequestMapping("/v1/c3mError") public class C3mReportErrorController { private C3mReportErrorService c3mReportErrorService; @GetMapping("/list") public ResponseVO<Object> listReportError(BaseConditionVO conditionVO){ return ResponseUtil.success(c3mReportErrorService.listReportError(conditionVO)); } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
@@ -1,12 +1,20 @@ package com.sandu.ximon.admin.service; import com.github.pagehelper.PageHelper; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame; import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ErrorEnum; import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.bo.C3ReportErrorBo; import com.sandu.ximon.dao.bo.LightReportErrorBo; import com.sandu.ximon.dao.domain.C3mReportError; import com.sandu.ximon.dao.mapper.C3mReportErrorMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; /** * @author LiuHaoNan @@ -37,4 +45,17 @@ c3MReportError.setErrorMsg(sb.toString()); save(c3MReportError); } public List<C3ReportErrorBo> listReportError(BaseConditionVO baseConditionVO) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); List<C3ReportErrorBo> c3ReportErrorBos; //为nullçè¯æ¯è¶ 管 if (SecurityUtils.getClientId() == null) { c3ReportErrorBos = baseMapper.listReportError(null); } else { c3ReportErrorBos = baseMapper.listReportError(SecurityUtils.getUserId()); } return c3ReportErrorBos; } }