新加字段定义

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsProject.java

@@ -33,6 +33,7 @@ public class KwsProject implements Serializable {
      * 所属矿山id
      */
     private String mountainId;
+    private String mountainNewId;
 
     /**
      * 所属矿山名

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/ProjectService.java

@@ -141,7 +141,8 @@ public class ProjectService {
         project.setUpdateTime(now);
         project.setCompanyId(headerData.getCompanyId());
         project.setProjectType(projectAddDto.getProjectType());
-        project.setMountainId(projectAddDto.getMountainId());
+        project.setMountainId(headerData.getMountainId());
+        project.setMountainNewId(projectAddDto.getMountainId());
         List<KwsProject> projectList = projectMapper.selectListByType(projectAddDto.getProjectType());
         if (projectList.size() > 99) {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, "当前类型项目已经增加上限!");
@@ -225,7 +226,8 @@ public class ProjectService {
         HeaderData headerData = commonService.getHeaderData(request);
         KwsProject project = new KwsProject();
         BeanUtils.copyProperties(projectAddDto, project);
-        project.setMountainId(projectAddDto.getMountainId());
+        project.setMountainNewId(projectAddDto.getMountainId());
+        project.setMountainId(headerData.getMountainId());
         project.setId(Long.parseLong(projectAddDto.getId()));
         project.setStatus(NumberConstant.ZERO);
         LocalDateTime now = LocalDateTime.now();
@@ -348,7 +350,7 @@ public class ProjectService {
         HeaderData headerData = commonService.getHeaderData(request);
         Long projectId = Long.parseLong(bindDevice.getProjectId());
         KwsProject project = projectMapper.selectOne(new LambdaQueryWrapper<KwsProject>().eq(KwsProject::getId, projectId));
-        String mountainId = project.getMountainId();
+        String mountainId = project.getMountainNewId();
         KwsCompany kwsCompany = companyMapper.selectByPrimaryKey(Long.parseLong(mountainId));
         if (kwsCompany == null) {
             log.error("projectId:{},mountainId:{}", projectId, mountainId);
@@ -1332,6 +1334,7 @@ public class ProjectService {
                     .eq(KwsDevice::getMountainId, headerData.getMountainId())
                     .eq(KwsDevice::getDelFlag, 0)
                     .set(KwsDevice::getRelevanceLevel, 0)
+                    .set(KwsDevice::getRelated, 0)
                     .set(KwsDevice::getInstallTime, null)
                     .set(KwsDevice::getLogicAlt, null)
                     .set(KwsDevice::getDeviceCode, null)

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsProjectMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="mountain_id" jdbcType="VARCHAR" property="mountainId"/>
+        <result column="mountain_new_id" jdbcType="VARCHAR" property="mountainNewId"/>
         <result column="company_id" jdbcType="VARCHAR" property="companyId"/>
         <result column="mountain_name" jdbcType="VARCHAR" property="mountainName"/>
         <result column="platform_name" jdbcType="VARCHAR" property="platformName"/>
@@ -32,6 +33,7 @@
         id,
         `name`,
         mountain_id,
+        mountain_new_id,
         project_type,
         project_no,
         mountain_name,