From f924586e776528106484849395ced125ad07c062 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 3 Nov 2023 14:47:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java | 10 +++++----- .../com/njcn/user/service/impl/AppUserServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java index d92fa4c53..226f6eaf8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java @@ -44,31 +44,31 @@ public class RStatLimitRateDPO { private Integer allTime; /** - * 闪变总计算次数 + * 闪变越限次数 */ @TableField(value = "flicker_overtime") private Integer flickerOvertime; /** - * 频率偏差越限次数 + * 闪变总计算次数 */ @TableField(value = "flicker_all_time") private Integer flickerAllTime; /** - * 电压偏差越限次数 + * 频率偏差越限次数 */ @TableField(value = "freq_dev_overtime") private Integer freqDevOvertime; /** - * 电压不平衡度越限次数 + * 电压偏差越限次数 */ @TableField(value = "voltage_dev_overtime") private Integer voltageDevOvertime; /** - * 闪变越限次数 + * 三相电压不平衡度越限次数 */ @TableField(value = "ubalance_overtime") private Integer ubalanceOvertime; diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java index 0f5015889..03a230677 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java @@ -257,7 +257,8 @@ public class AppUserServiceImpl extends ServiceImpl impleme @Override public List getAdminInfo() { - return this.lambdaQuery().eq(User::getLoginName,"njcnyw").eq(User::getState,1).list(); + //这边先排除掉dev_code不存在的业务管理员 + return this.lambdaQuery().eq(User::getType,1).eq(User::getState,1).ne(User::getDevCode,"").list(); } /** From 70c025fde331530b981df90dff26ed79328eaa8d Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 3 Nov 2023 16:04:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/common/utils/PubUtils.java | 2 +- .../swagger/config/Knife4jSwaggerConfig.java | 4 ++- .../device/biz/commApi/CommLineClient.java | 14 +++++++- .../ledgerManger/CommLineController.java | 11 +++++++ .../mapper/majornetwork/MonitorMapper.java | 8 +++++ .../majornetwork/mapping/MonitorMapper.xml | 17 ++++++++++ .../service/majornetwork/IMonitorService.java | 5 +++ .../majornetwork/impl/MonitorServiceImpl.java | 28 ++++++++++++++++ .../pq/controller/CommLineController.java | 12 +++++++ .../com/njcn/device/pq/mapper/LineMapper.java | 6 ++++ .../device/pq/mapper/mapping/LineMapper.xml | 27 +++++++++++++++ .../njcn/device/pq/service/LineService.java | 5 +++ .../pq/service/impl/LineServiceImpl.java | 33 ++++++++++++++++++- pqs-gateway/pom.xml | 1 - 14 files changed, 168 insertions(+), 5 deletions(-) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java b/pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java index 6f9468864..fc2ec2335 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java @@ -154,7 +154,7 @@ public class PubUtils { MAPPER.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); return MAPPER.writeValueAsString(object); } catch (IOException e) { - throw new IllegalArgumentException("将将实体对象转为JSON时发生错误:" + object, e); + throw new IllegalArgumentException("将实体对象转为JSON时发生错误:" + object, e); } } diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java index e33fdd8bd..0d64d083c 100644 --- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java +++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java @@ -75,7 +75,9 @@ public class Knife4jSwaggerConfig { "com.njcn.stat.controller", "com.njcn.rt.controller", "com.njcn.zlevent.controller", - "com.njcn.cloud.controller" + "com.njcn.cloud.controller", + "com.njcn.zlevent.controller", + "com.njcn.prepare" ) .collect(Collectors.toList()); List grantTypes = new ArrayList<>(); diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java index 2ab4d2e34..df53eac1c 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java @@ -6,8 +6,11 @@ import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFac import com.njcn.device.biz.pojo.dto.LineDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * pqs * @@ -22,11 +25,20 @@ import org.springframework.web.bind.annotation.RequestParam; public interface CommLineClient { /** - * @Description: 获取监测点信息 * @param id + * @Description: 获取监测点信息 * @Author: wr * @Date: 2023/9/22 11:11 */ @GetMapping("/getLineDetail") HttpResult getLineDetail(@RequestParam("id") String id); + + /*** + * 批量获取监测点信息 + * @author hongawen + * @date 2023/11/3 15:25 + * @param ids 监测点索引集合 + */ + @PostMapping("/getLineDetailBatch") + HttpResult> getLineDetailBatch(@RequestParam("ids") List ids); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java index 617215f2f..4822d1fd4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * pqs * @@ -43,4 +45,13 @@ public class CommLineController extends BaseController { LineDTO result = monitorService.getLineDetail(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getLineDetailBatch") + @ApiOperation("批量获取监测点信息") + public HttpResult> getLineDetailBatch(@RequestParam("ids") List ids) { + String methodDescribe = getMethodDescribe("getLineDetailBatch"); + List result = monitorService.getLineDetailBatch(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java index 2c882c859..5e8df1b24 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java @@ -79,6 +79,7 @@ public interface MonitorMapper extends BaseMapper { */ MonitorVO getPwMonitorTerminal(@Param("id")String id); + /** * @Description: 根据监测点id获取监测点信息 * @param id @@ -88,6 +89,11 @@ public interface MonitorMapper extends BaseMapper { */ LineDTO selectLineDetail(@Param("id")String id); + /** + * @Description: 根据监测点id批量获取监测点信息 + */ + List selectLineDetailBatch(@Param("ids")List ids); + /** * @Description: * @param param @@ -99,4 +105,6 @@ public interface MonitorMapper extends BaseMapper { Map getCustomDetailByLineId(@Param("lineId")String lineId); + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml index 320523e53..25ac39e7d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml @@ -172,6 +172,23 @@ WHERE pm.id = #{id} + +