Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

文件move位置

Browse Source
This commit is contained in:
hzj
2024-05-13 15:03:55 +08:00
parent a8d229fe5d
commit 9fbb5b0bb9
22 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionDevMainReportParam.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.param.user; package com.njcn.supervision.pojo.param.device;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempDeviceReportParam.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.param.user; package com.njcn.supervision.pojo.param.device;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempLineReportParam.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.param.user; package com.njcn.supervision.pojo.param.device;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionDevMainReportPO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.po.dev; package com.njcn.supervision.pojo.po.device;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempDeviceReport.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.po.dev; package com.njcn.supervision.pojo.po.device;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempLineReport.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.pojo.po.dev; package com.njcn.supervision.pojo.po.device;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/dev/DeVReportManageController.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.controller.dev; package com.njcn.supervision.controller.device;
import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.OperateType;
@@ -6,8 +6,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam; import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService; import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.mapper.mapper; package com.njcn.supervision.mapper.device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice; import com.njcn.supervision.pojo.po.device.QuitRunningDevice;

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionDevMainReportPOMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionDevMainReportPOMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.supervision.mapper.dev; package com.njcn.supervision.mapper.device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
/** /**
* Description: * Description:

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempDeviceReportMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempDeviceReportMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.supervision.mapper.dev; package com.njcn.supervision.mapper.device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
/** /**
* *

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempLineReportMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineReportMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.supervision.mapper.dev; package com.njcn.supervision.mapper.device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
/** /**
* *

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.supervision.mapper.mapper.QuitRunningDeviceMapper"> <mapper namespace="com.njcn.supervision.mapper.device.QuitRunningDeviceMapper">
</mapper> </mapper>

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionDevMainReportPOMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionDevMainReportPOMapper"> <mapper namespace="com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO"> <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table supervision_dev_main_report--> <!--@Table supervision_dev_main_report-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempDeviceReportMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionTempDeviceReportMapper"> <mapper namespace="com.njcn.supervision.mapper.device.SupervisionTempDeviceReportMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport"> <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table supervision_temp_device_report--> <!--@Table supervision_temp_device_report-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempLineReportMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionTempLineReportMapper"> <mapper namespace="com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport"> <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempLineReport">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table supervision_temp_line_report--> <!--@Table supervision_temp_line_report-->
<result column="id" jdbcType="VARCHAR" property="id" /> <result column="id" jdbcType="VARCHAR" property="id" />

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionDevMainReportPOService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionDevMainReportPOService.java
View File

@@ -1,8 +1,8 @@
package com.njcn.supervision.service.dev; package com.njcn.supervision.service.device;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam; import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import java.util.List; import java.util.List;

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempDeviceReportService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempDeviceReportService.java
View File

@@ -1,6 +1,6 @@
package com.njcn.supervision.service.dev; package com.njcn.supervision.service.device;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* *

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempLineReportService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineReportService.java
View File

@@ -1,6 +1,6 @@
package com.njcn.supervision.service.dev; package com.njcn.supervision.service.device;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* *

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
View File

@@ -1,19 +1,13 @@
package com.njcn.supervision.service.device.impl; package com.njcn.supervision.service.device.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient; import com.njcn.bpm.api.BpmProcessFeignClient;
import com.njcn.bpm.enums.BpmTaskStatusEnum; import com.njcn.bpm.enums.BpmTaskStatusEnum;
import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.supervision.enums.UserNatureEnum; import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper;
import com.njcn.supervision.mapper.mapper.QuitRunningDeviceMapper;
import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice; import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.po.user.UserReportPO;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
import com.njcn.supervision.service.device.IQuitRunningDeviceService; import com.njcn.supervision.service.device.IQuitRunningDeviceService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

22
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionDevMainReportPOServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.njcn.supervision.service.dev.impl; package com.njcn.supervision.service.device.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,16 +8,16 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.mapper.dev.SupervisionDevMainReportPOMapper; import com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper;
import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam; import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
import com.njcn.supervision.pojo.param.user.SupervisionTempDeviceReportParam; import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam;
import com.njcn.supervision.pojo.param.user.SupervisionTempLineReportParam; import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO; import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService; import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService; import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
import com.njcn.supervision.service.dev.SupervisionTempLineReportService; import com.njcn.supervision.service.device.SupervisionTempLineReportService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

10
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempDeviceReportServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempDeviceReportServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.njcn.supervision.service.dev.impl; package com.njcn.supervision.service.device.impl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.supervision.mapper.dev.SupervisionTempDeviceReportMapper; import com.njcn.supervision.mapper.device.SupervisionTempDeviceReportMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService; import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
/** /**
* *
* Description: * Description:

10
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempLineReportServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.njcn.supervision.service.dev.impl; package com.njcn.supervision.service.device.impl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.supervision.mapper.dev.SupervisionTempLineReportMapper; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
import com.njcn.supervision.service.dev.SupervisionTempLineReportService; import com.njcn.supervision.service.device.SupervisionTempLineReportService;
/** /**
* *
* Description: * Description: