diff --git a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java index 284aa7d7d..9785e330b 100644 --- a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java +++ b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java @@ -21,7 +21,7 @@ public class GenerateCode { private static final String TARGET_DIR = "D://code"; - private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/pqs9100"; + private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/pqsinfo_ln"; // private static final String DB_URL = "jdbc:oracle:thin:@192.168.1.170:1521:pqsbase"; private static final String USERNAME = "root"; @@ -30,9 +30,9 @@ public class GenerateCode { public static void main(String[] args) { List modules = Stream.of( - new Module("hongawen", "com.njcn.gather", "", Stream.of( - "pq_dev_type" - ).collect(Collectors.toList()), "pq_") + new Module("cdf", "com.njcn.device", "", Stream.of( + "pq_icd_path" + ).collect(Collectors.toList()), "") ).collect(Collectors.toList()); generateJavaFile(modules); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/constant/Param.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/constant/Param.java index 6879ac17c..5508cda65 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/constant/Param.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/constant/Param.java @@ -62,7 +62,16 @@ public interface Param { String pst = "pst$DataPlt"; + String ADD ="add"; + String UPDATE ="update"; + String DEL ="del"; + String QUERY = "query"; + String ADD_ZN = "新增"; + String UPDATE_ZN = "修改"; + String DEL_ZN = "删除"; + String QUERY_ZN ="查询"; + String UNKONOW ="未知"; Integer YEAR = 1; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyTargetVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyTargetVO.java index 25c0e82cc..2c2776306 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyTargetVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/VerifyTargetVO.java @@ -27,6 +27,9 @@ public class VerifyTargetVO { @ApiModelProperty(value = "异常测点集合",name = "ids") private Set ids; + @ApiModelProperty(value = "类型",name = "remark") + private String remark; + @ApiModelProperty(value = "排序",name = "sort") private Integer sort; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java index 42641b1af..72fd6f965 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java @@ -11,6 +11,7 @@ import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.dataProcess.api.DataLimitRateDetailFeignClient; import com.njcn.dataProcess.api.DataLimitRateFeignClient; import com.njcn.dataProcess.api.DataLimitTargetFeignClient; @@ -22,6 +23,7 @@ import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto; import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto; import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; +import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import com.njcn.device.pq.constant.Param; import com.njcn.device.pq.mapper.DataVerifyMapper; @@ -102,6 +104,9 @@ public class DataVerifyServiceImpl extends ServiceImpl monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam); + if(CollUtil.isEmpty(monitorIds)){ + throw new BusinessException(DeviceResponseEnum.QUERY_LINE_DATA_EMPTY); + } List dataVerifyList = commQuery(monitorIds, monitorBaseParam); VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO(); verifyMonitorVO.setRunNum(monitorIds.size()); @@ -416,12 +421,13 @@ public class DataVerifyServiceImpl extends ServiceImpl> jsonMap = jsonBaseVOList.stream().collect(Collectors.groupingBy(JsonBaseVO::getPhasic)); jsonMap.forEach((phasic, list) -> { Map> valueTypeMap = list.stream().collect(Collectors.groupingBy(JsonBaseVO::getValueType)); - DetailAbnormalVO.DetailLimitInnerVO vo = new DetailAbnormalVO.DetailLimitInnerVO(); valueTypeMap.forEach((valueTypeId, vList) -> { vList.forEach(it -> { String[] timeArr = it.getTime().split(StrUtil.COMMA); String[] valArr = it.getValue().split(StrUtil.COMMA); for(int i = 0;i implements TerminalBaseService { private final DeviceMapper deviceMapper; private final SuperDataMapper superDataMapper; - private final IPqsTerminalLogsService iPqsTerminalLogsService; + private final PqsTerminalLogsMapper pqsTerminalLogsMapper; private final LineMapper lineMapper; private final DevFuctionMapper devFuctionMapper; private final AreaFeignClient areaFeignClient; @@ -872,11 +873,18 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple String index = RequestUtil.getUserIndex(); queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes); } + + + } } } } } + + if(CollUtil.isNotEmpty(logsList)){ + terminalLogsCat(logsList,1); + } } if (isSync) { /*** @@ -977,8 +985,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple terminalLogsNew.setLogsType(data.getId()); terminalLogsNew.setState(DataStateEnum.ENABLE.getCode()); terminalLogsNew.setIsPush(DataStateEnum.ENABLE.getCode()); - terminalLogsNew.setOperateType("update"); - iPqsTerminalLogsService.save(terminalLogsNew); + terminalLogsNew.setOperateType(Param.UPDATE); + pqsTerminalLogsMapper.insert(terminalLogsNew); } /** @@ -3947,19 +3955,23 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple * 终端日志记录 */ private void terminalLogsCat(List logsList,Integer operateType){ - String op; + String op,operate; switch (operateType){ case 0: - op = "新增"; + op = Param.ADD_ZN; + operate = Param.ADD; break; case 1: - op = "修改"; + op = Param.UPDATE_ZN; + operate = Param.UPDATE; break; case 2: - op = "删除"; + op = Param.DEL_ZN; + operate = Param.DEL; break; default: - op="未知"; + op=Param.UNKONOW; + operate = Param.UNKONOW; break; } String name = RequestUtil.getUserNickname(); @@ -3971,8 +3983,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple pqsTerminalLogs.setTerminalDescribe(name+"进行"+op+(Objects.equals(line.getLevel(), LineBaseEnum.LINE_LEVEL.getCode()) ? LineBaseEnum.LINE_LEVEL.getMessage():LineBaseEnum.DEVICE_LEVEL.getMessage())+"操作;监测点名称:"+line.getName()); pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode()); pqsTerminalLogs.setIsPush(DataStateEnum.ENABLE.getCode()); + pqsTerminalLogs.setOperateType(operate); pqsTerminalLogs.setObjIndex(line.getId()); - iPqsTerminalLogsService.save(pqsTerminalLogs); + pqsTerminalLogsMapper.insert(pqsTerminalLogs); } }