项目、机组修改

core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java

@@ -38,11 +38,6 @@ public class PersonnelEntity extends AuditableEntity implements Serializable {
     @TableField("role_type")
     private String roleType;
 
-    @ExcelProperty("公司id")
-    @ApiModelProperty("公司id")
-    @TableField("company_id")
-    private String companyId;
-
     @ExcelProperty("密码")
     @ApiModelProperty("密码")
     @TableField("password")

core/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java

@@ -1,41 +0,0 @@
-package com.dite.znpt.domain.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.dite.znpt.domain.AuditableEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息表实体类
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("project_company")
-@ApiModel(value="ProjectCompanyEntity对象", description="项目-公司关联信息表")
-public class ProjectCompanyEntity extends AuditableEntity implements Serializable {
-
-    private static final long serialVersionUID = -98876147355655939L;
-
-    @ExcelProperty("项目id")
-    @ApiModelProperty("项目id")
-    @TableId(value = "project_id", type = IdType.ASSIGN_UUID)
-    private String projectId;
-
-    @ExcelProperty("公司id")
-    @ApiModelProperty("公司id")
-    @TableField("company_id")
-    private String companyId;
-
-    @ExcelProperty("单位类型（检查/委托）")
-    @ApiModelProperty("单位类型（检查/委托）")
-    @TableField("relation_type")
-    private String relationType;
-}
-

core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dite.znpt.domain.AuditableEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +34,10 @@ public class ProjectEntity extends AuditableEntity implements Serializable {
     @TableField("project_name")
     private String projectName;
 
+    @ApiModelProperty("项目封面")
+    @TableField("cover_url")
+    private String coverUrl;
+
     @ExcelProperty("风场名称")
     @ApiModelProperty("风场名称")
     @TableField("farm_name")
@@ -43,10 +48,29 @@ public class ProjectEntity extends AuditableEntity implements Serializable {
     @TableField("farm_address")
     private String farmAddress;
 
-    @ExcelProperty("检查方式，字典method_id")
+    @ApiModelProperty("委托单位")
-    @ApiModelProperty("检查方式，字典method_id")
+    @TableField("client")
-    @TableField("method_id")
+    private String client;
-    private String methodId;
+
+    @ApiModelProperty("委托单位联系人")
+    @TableField("client_contact")
+    private String clientContact;
+
+    @ApiModelProperty("委托单位联系电话")
+    @TableField("client_phone")
+    private String clientPhone;
+
+    @ApiModelProperty("检查单位")
+    @TableField("inspection_unit")
+    private String inspectionUnit;
+
+    @ApiModelProperty("检查单位联系人")
+    @TableField("inspection_contact")
+    private String inspectionContact;
+
+    @ApiModelProperty("检查单位联系电话")
+    @TableField("inspection_phone")
+    private String inspectionPhone;
 
     @ExcelProperty("项目规模")
     @ApiModelProperty("项目规模")
@@ -58,9 +82,74 @@ public class ProjectEntity extends AuditableEntity implements Serializable {
     @TableField("turbine_model")
     private String turbineModel;
 
-    @ExcelProperty("项目状态，字典project_status")
+    @ApiModelProperty("施工人员")
-    @ApiModelProperty("项目状态，字典project_status")
+    @TableField("construction_personnel")
+    private String constructionPersonnel;
+
+    @ApiModelProperty("施工人员id")
+    @TableField("construction_personnel_id")
+    private String constructionPersonnelId;
+
+    @ApiModelProperty("安全员id")
+    @TableField("auditor_id")
+    private String auditorId;
+
+    @ApiModelProperty("质量员id")
+    @TableField("quality_officer_id")
+    private String qualityOfficerId;
+
+    @ApiModelProperty("项目经理id")
+    @TableField("project_manager_id")
+    private String projectManagerId;
+
+    @ApiModelProperty("施工组长id")
+    @TableField("construction_team_leader_id")
+    private String constructionTeamLeaderId;
+
+    @ApiModelProperty("技术方案图片，多个用逗号隔开")
+    @JsonIgnore
+    @TableField("technical_image")
+    private String technicalImage;
+
+    @ApiModelProperty("技术方案内容")
+    @TableField("technical_content")
+    private String technicalContent;
+
+    @ApiModelProperty("安全措施图片，多个用逗号隔开")
+    @JsonIgnore
+    @TableField("safety_image")
+    private String safetyImage;
+
+    @ApiModelProperty("安全措施内容")
+    @TableField("safety_content")
+    private String safetyContent;
+
+    @ApiModelProperty("交底内容")
+    @TableField("disclose_content")
+    private String discloseContent;
+
+    @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收")
     @TableField("status")
-    private String status;
+    private Integer status;
+
+    @ApiModelProperty("项目工作类型 可能有多项，逗号分隔")
+    @TableField("work_type")
+    private String workType;
+
+    @ApiModelProperty("项目工作岗位 可能有多项，json对象保存")
+    @TableField("job")
+    private String job;
+
+    @ApiModelProperty(value = "项目工作类型 可能有多项，逗号分隔", example = "1", notes = "项目工作类型 可能有多项，逗号分隔")
+    @TableField("work_type")
+    private String workType;
+
+    @ApiModelProperty(value = "项目工作岗位 可能有多项，逗号分隔", example = "1", notes = "项目工作岗位 可能有多项，逗号分隔")
+    @TableField("job")
+    private String job;
+
+    @ApiModelProperty(value = "项目安全风险点", example = "1", notes = "项目安全风险点 可能有多项，逗号分隔")
+    @TableField("safety_risk_point")
+    private String safetyRiskPoint;
 }
 

core/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java

@@ -1,51 +0,0 @@
-package com.dite.znpt.domain.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.dite.znpt.domain.AuditableEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息表实体类
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_company")
-@ApiModel(value="TCompanyEntity对象", description="公司信息表")
-public class TCompanyEntity extends AuditableEntity implements Serializable {
-
-    private static final long serialVersionUID = 348031306551320799L;
-
-    @ExcelProperty("公司id")
-    @ApiModelProperty("公司id")
-    @TableId(value = "company_id", type = IdType.ASSIGN_UUID)
-    private String companyId;
-
-    @ExcelProperty("公司名称")
-    @ApiModelProperty("公司名称")
-    @TableField("company_name")
-    private String companyName;
-
-    @ExcelProperty("公司地址")
-    @ApiModelProperty("公司地址")
-    @TableField("address")
-    private String address;
-
-    @ExcelProperty("联系人")
-    @ApiModelProperty("联系人")
-    @TableField("contact")
-    private String contact;
-
-    @ExcelProperty("电话")
-    @ApiModelProperty("电话")
-    @TableField("phone")
-    private String phone;
-}
-

core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java

@@ -52,5 +52,13 @@ public class TurbineEntity extends AuditableEntity implements Serializable {
     @ApiModelProperty("机组型号")
     @TableField("model")
     private String model;
+
+    @ApiModelProperty("封面图")
+    @TableField("cover_url")
+    private String coverUrl;
+
+    @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收")
+    @TableField("status")
+    private Integer status;
 }
 

core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java

@@ -1,33 +0,0 @@
-package com.dite.znpt.domain.vo;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息请求实体
- */
-@Data
-@ApiModel("项目-公司关联信息列表请求实体")
-public class ProjectCompanyListReq implements Serializable {
-
-    private static final long serialVersionUID = 598388421634125600L;
-
-    @ApiModelProperty("查询关键字")
-    private String keyword;
-
-    @ApiModelProperty("项目-公司关联信息Id")
-    private String projectId;
-
-    @ApiModelProperty("公司id")
-    private String companyId;
-
-    @ApiModelProperty("单位类型（检查/委托）")
-    private String relationType;
-
-}
-

core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java

@@ -1,18 +0,0 @@
-package com.dite.znpt.domain.vo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.dite.znpt.domain.entity.ProjectCompanyEntity;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息响应实体
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("项目-公司关联信息响应实体")
-public class ProjectCompanyResp extends ProjectCompanyEntity {
-}
-

core/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java

@@ -1,39 +0,0 @@
-package com.dite.znpt.domain.vo;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息请求实体
- */
-@Data
-@ApiModel("公司信息列表请求实体")
-public class TCompanyListReq implements Serializable {
-
-    private static final long serialVersionUID = 710069618133737043L;
-
-    @ApiModelProperty("查询关键字")
-    private String keyword;
-
-    @ApiModelProperty("公司信息Id")
-    private String companyId;
-
-    @ApiModelProperty("公司名称")
-    private String companyName;
-
-    @ApiModelProperty("公司地址")
-    private String address;
-
-    @ApiModelProperty("联系人")
-    private String contact;
-
-    @ApiModelProperty("电话")
-    private String phone;
-
-}
-

core/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java

@@ -1,18 +0,0 @@
-package com.dite.znpt.domain.vo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.dite.znpt.domain.entity.TCompanyEntity;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息响应实体
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("公司信息响应实体")
-public class TCompanyResp extends TCompanyEntity {
-}
-

core/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java

@@ -1,10 +1,14 @@
 package com.dite.znpt.domain.vo;
 
+import com.dite.znpt.domain.entity.PartEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.dite.znpt.domain.entity.TurbineEntity;
 
+import java.util.List;
+
 /**
  * @author huise23
  * @date 2025/04/11 23:17
@@ -14,5 +18,44 @@ import com.dite.znpt.domain.entity.TurbineEntity;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("机组-项目关联响应实体")
 public class TurbineResp extends TurbineEntity {
+
+    @ApiModelProperty("部件")
+    private List<PartEntity> partsList;
+
+    @ApiModelProperty("内部工作状态， -1不存在，0未开始、1开始施工、2已提交报告、3审核通过")
+    private String antiThunderWorkStatus;
+
+    @ApiModelProperty("外部工作状态， -1不存在，0未开始、1开始施工、2已提交报告、3审核通过")
+    private String inWorkStatus;
+
+    @ApiModelProperty("防雷工作状态， -1不存在，0未开始、1开始施工、2已提交报告、3审核通过")
+    private String outWorkStatus;
+
+    @ApiModelProperty("数据报告工作状态， -1不存在，0未开始、1开始施工、2已提交报告、3审核通过")
+    private String summaryWorkStatus;
+
+    @ApiModelProperty("内部工作安全员审核状态， -1不存在，0未审核、1审核通过")
+    private String antiThunderWorkSafetyStatus;
+
+    @ApiModelProperty("外部工作安全员审核状态， -1不存在，0未审核、1审核通过")
+    private String inWorkSafetyStatus;
+
+    @ApiModelProperty("防雷工作安全员审核状态， -1不存在，0未审核、1审核通过")
+    private String outWorkSafetyStatus;
+
+    @ApiModelProperty("内部工作质量员审核状态， -1不存在，0未审核、1审核通过")
+    private String antiThunderWorkQualityStatus;
+
+    @ApiModelProperty("外部工作质量员审核状态， -1不存在，0未审核、1审核通过")
+    private String inWorkQualityStatus;
+
+    @ApiModelProperty("防雷工作质量员审核状态， -1不存在，0未审核、1审核通过")
+    private String outWorkQualityStatus;
+
+    @ApiModelProperty("防雷是否不合格，1不合格，0合格")
+    private Boolean lightningUnqualified;
+
+    @ApiModelProperty("来源， app，backend后台，不传参默认后台")
+    private String source;
 }
 

core/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java

@@ -1,19 +0,0 @@
-package com.dite.znpt.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dite.znpt.domain.entity.ProjectCompanyEntity;
-import com.dite.znpt.domain.vo.ProjectCompanyListReq;
-import com.dite.znpt.domain.vo.ProjectCompanyResp;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息表数据库访问层
- */
-public interface ProjectCompanyMapper extends BaseMapper<ProjectCompanyEntity> {
-    List<ProjectCompanyResp> queryBySelective(ProjectCompanyListReq projectCompanyReq);
-}
-

core/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java

@@ -1,19 +0,0 @@
-package com.dite.znpt.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dite.znpt.domain.entity.TCompanyEntity;
-import com.dite.znpt.domain.vo.TCompanyListReq;
-import com.dite.znpt.domain.vo.TCompanyResp;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息表数据库访问层
- */
-public interface TCompanyMapper extends BaseMapper<TCompanyEntity> {
-    List<TCompanyResp> queryBySelective(TCompanyListReq tCompanyReq);
-}
-

core/src/main/java/com/dite/znpt/service/ProjectCompanyService.java

@@ -1,64 +0,0 @@
-package com.dite.znpt.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dite.znpt.domain.entity.ProjectCompanyEntity;
-import com.dite.znpt.domain.vo.ProjectCompanyListReq;
-import com.dite.znpt.domain.vo.ProjectCompanyResp;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息表服务接口
- */
-public interface ProjectCompanyService extends IService<ProjectCompanyEntity> {
-
-    /**
-     * 功能描述：查询项目-公司关联信息列表
-     *
-     * @param projectCompanyReq 项目-公司关联信息
-     * @return {@link List }<{@link ProjectCompanyEntity }>
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    List<ProjectCompanyResp> selectList(ProjectCompanyListReq projectCompanyReq);
-
-    /**
-     * 功能描述：查询单条项目-公司关联信息
-     *
-     * @param projectId 项目-公司关联信息Id
-     * @return {@link ProjectCompanyResp }
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    ProjectCompanyResp selectById(String projectId);
-
-    /**
-     * 功能描述：新增项目-公司关联信息
-     *
-     * @param projectCompany 项目-公司关联信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void saveData(ProjectCompanyEntity projectCompany);
-
-    /**
-     * 功能描述：更新项目-公司关联信息
-     *
-     * @param projectCompany 项目-公司关联信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void updateData(ProjectCompanyEntity projectCompany);
-
-    /**
-     * 功能描述：删除项目-公司关联信息
-     *
-     * @param projectId 项目-公司关联信息Id
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void deleteById(String projectId);
-}
-

core/src/main/java/com/dite/znpt/service/TCompanyService.java

@@ -1,64 +0,0 @@
-package com.dite.znpt.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dite.znpt.domain.entity.TCompanyEntity;
-import com.dite.znpt.domain.vo.TCompanyListReq;
-import com.dite.znpt.domain.vo.TCompanyResp;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息表服务接口
- */
-public interface TCompanyService extends IService<TCompanyEntity> {
-
-    /**
-     * 功能描述：查询公司信息列表
-     *
-     * @param tCompanyReq 公司信息
-     * @return {@link List }<{@link TCompanyEntity }>
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    List<TCompanyResp> selectList(TCompanyListReq tCompanyReq);
-
-    /**
-     * 功能描述：查询单条公司信息
-     *
-     * @param companyId 公司信息Id
-     * @return {@link TCompanyResp }
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    TCompanyResp selectById(String companyId);
-
-    /**
-     * 功能描述：新增公司信息
-     *
-     * @param tCompany 公司信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void saveData(TCompanyEntity tCompany);
-
-    /**
-     * 功能描述：更新公司信息
-     *
-     * @param tCompany 公司信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void updateData(TCompanyEntity tCompany);
-
-    /**
-     * 功能描述：删除公司信息
-     *
-     * @param companyId 公司信息Id
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    void deleteById(String companyId);
-}
-

core/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java

@@ -1,99 +0,0 @@
-package com.dite.znpt.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dite.znpt.domain.entity.ProjectCompanyEntity;
-import com.dite.znpt.domain.vo.ProjectCompanyListReq;
-import com.dite.znpt.domain.vo.ProjectCompanyResp;
-import com.dite.znpt.service.ProjectCompanyService;
-import com.dite.znpt.mapper.ProjectCompanyMapper;
-import org.springframework.stereotype.Service;
-import cn.hutool.core.collection.CollUtil;
-import lombok.RequiredArgsConstructor;
-import com.dite.znpt.util.PageUtil;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 项目-公司关联信息表服务实现类
- */
-@Service
-@RequiredArgsConstructor
-public class ProjectCompanyServiceImpl extends ServiceImpl<ProjectCompanyMapper, ProjectCompanyEntity> implements ProjectCompanyService {
-
-    /**
-     * 功能描述：查询项目-公司关联信息列表
-     *
-     * @param projectCompanyReq 项目-公司关联信息信息
-     * @return {@link List }<{@link ProjectCompanyResp }>
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public List<ProjectCompanyResp> selectList(ProjectCompanyListReq projectCompanyReq) {
-        PageUtil.startPage();
-        List<ProjectCompanyResp> projectCompanyList= this.baseMapper.queryBySelective(projectCompanyReq);
-        projectCompanyList.forEach(resp -> {
-            
-        });
-        return projectCompanyList;
-    }
-
-    /**
-     * 功能描述：查询单条项目-公司关联信息
-     *
-     * @param projectId 项目-公司关联信息Id
-     * @return {@link ProjectCompanyResp }
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public ProjectCompanyResp selectById(String projectId) {
-        ProjectCompanyListReq projectCompanyReq = new ProjectCompanyListReq();
-        projectCompanyReq.setProjectId(projectId);
-
-        List<ProjectCompanyResp> list = selectList(projectCompanyReq);
-        return list.isEmpty() ? CollUtil.getFirst(list) : new ProjectCompanyResp();
-    }
-
-    /**
-     * 功能描述：新增项目-公司关联信息
-     *
-     * @param projectCompany 项目-公司关联信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void saveData(ProjectCompanyEntity projectCompany) {
-//            todo 校验
-        save(projectCompany);
-    }
-
-    /**
-     * 功能描述：更新项目-公司关联信息
-     *
-     * @param projectCompany 项目-公司关联信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void updateData(ProjectCompanyEntity projectCompany) {
-//            todo 校验
-        updateById(projectCompany);
-    }
-
-    /**
-     * 功能描述：删除项目-公司关联信息
-     *
-     * @param projectId 项目-公司关联信息Id
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void deleteById(String projectId) {
-//            todo 校验
-        removeById(projectId);
-    }
-
-}

core/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java

@@ -1,99 +0,0 @@
-package com.dite.znpt.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dite.znpt.domain.entity.TCompanyEntity;
-import com.dite.znpt.domain.vo.TCompanyListReq;
-import com.dite.znpt.domain.vo.TCompanyResp;
-import com.dite.znpt.service.TCompanyService;
-import com.dite.znpt.mapper.TCompanyMapper;
-import org.springframework.stereotype.Service;
-import cn.hutool.core.collection.CollUtil;
-import lombok.RequiredArgsConstructor;
-import com.dite.znpt.util.PageUtil;
-
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- * @Description: 公司信息表服务实现类
- */
-@Service
-@RequiredArgsConstructor
-public class TCompanyServiceImpl extends ServiceImpl<TCompanyMapper, TCompanyEntity> implements TCompanyService {
-
-    /**
-     * 功能描述：查询公司信息列表
-     *
-     * @param tCompanyReq 公司信息信息
-     * @return {@link List }<{@link TCompanyResp }>
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public List<TCompanyResp> selectList(TCompanyListReq tCompanyReq) {
-        PageUtil.startPage();
-        List<TCompanyResp> tCompanyList= this.baseMapper.queryBySelective(tCompanyReq);
-        tCompanyList.forEach(resp -> {
-            
-        });
-        return tCompanyList;
-    }
-
-    /**
-     * 功能描述：查询单条公司信息
-     *
-     * @param companyId 公司信息Id
-     * @return {@link TCompanyResp }
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public TCompanyResp selectById(String companyId) {
-        TCompanyListReq tCompanyReq = new TCompanyListReq();
-        tCompanyReq.setCompanyId(companyId);
-
-        List<TCompanyResp> list = selectList(tCompanyReq);
-        return list.isEmpty() ? CollUtil.getFirst(list) : new TCompanyResp();
-    }
-
-    /**
-     * 功能描述：新增公司信息
-     *
-     * @param tCompany 公司信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void saveData(TCompanyEntity tCompany) {
-//            todo 校验
-        save(tCompany);
-    }
-
-    /**
-     * 功能描述：更新公司信息
-     *
-     * @param tCompany 公司信息
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void updateData(TCompanyEntity tCompany) {
-//            todo 校验
-        updateById(tCompany);
-    }
-
-    /**
-     * 功能描述：删除公司信息
-     *
-     * @param companyId 公司信息Id
-     * @author huise23
-     * @date 2025/04/11 23:17
-     **/
-    @Override
-    public void deleteById(String companyId) {
-//            todo 校验
-        removeById(companyId);
-    }
-
-}

core/src/main/resources/mapper/ProjectCompanyMapper.xml

@@ -1,29 +0,0 @@
-<?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">
-<mapper namespace="com.dite.znpt.mapper.ProjectCompanyMapper">
-
-    <sql id="Base_Column_List">
-        a.project_id,         a.company_id,         a.relation_type
-    </sql>
-
-    <select id="queryBySelective" resultType="com.dite.znpt.domain.vo.ProjectCompanyResp">
-        select
-            <include refid="Base_Column_List"/>
-        from project_company a
-        <where>
-            <if test="keyword != null and keyword != ''">
-#                and (a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%') or a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%'))
-            </if>
-            <if test="projectId != null and projectId != ''">
-                and a.project_id like concat ('%', #{projectId}, '%')
-            </if>
-            <if test="companyId != null and companyId != ''">
-                and a.company_id like concat ('%', #{companyId}, '%')
-            </if>
-            <if test="relationType != null and relationType != ''">
-                and a.relation_type like concat ('%', #{relationType}, '%')
-            </if>
-        </where>
-    </select>
-</mapper>
-

core/src/main/resources/mapper/TCompanyMapper.xml

@@ -1,36 +0,0 @@
-<?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">
-<mapper namespace="com.dite.znpt.mapper.TCompanyMapper">
-
-    <sql id="Base_Column_List">
-        a.company_id,         a.company_name,         a.address,         a.contact, 
-        a.phone
-    </sql>
-
-    <select id="queryBySelective" resultType="com.dite.znpt.domain.vo.TCompanyResp">
-        select
-            <include refid="Base_Column_List"/>
-        from t_company a
-        <where>
-            <if test="keyword != null and keyword != ''">
-#                and (a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%') or a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%'))
-            </if>
-            <if test="companyId != null and companyId != ''">
-                and a.company_id like concat ('%', #{companyId}, '%')
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and a.company_name like concat ('%', #{companyName}, '%')
-            </if>
-            <if test="address != null and address != ''">
-                and a.address like concat ('%', #{address}, '%')
-            </if>
-            <if test="contact != null and contact != ''">
-                and a.contact like concat ('%', #{contact}, '%')
-            </if>
-            <if test="phone != null and phone != ''">
-                and a.phone like concat ('%', #{phone}, '%')
-            </if>
-        </where>
-    </select>
-</mapper>
-

web/pom.xml

@@ -29,10 +29,10 @@
             <artifactId>core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.dite.znpt</groupId>
+<!--            <groupId>com.dite.znpt</groupId>-->
-            <artifactId>data-bus</artifactId>
+<!--            <artifactId>data-bus</artifactId>-->
-            <version>1.0.0-SNAPSHOT</version>
+<!--            <version>1.0.0-SNAPSHOT</version>-->
-        </dependency>
+<!--        </dependency>-->
     </dependencies>
 </project>

web/src/main/java/com/dite/znpt/web/controller/PartController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @author huise23
  * @date 2025/04/11 23:17
  */
-@Api(tags = "")
+@Api(tags = "部件信息")
 @RestController
 @RequestMapping("/part")
 public class PartController {

web/src/main/java/com/dite/znpt/web/controller/ProjectCompanyController.java

@@ -1,84 +0,0 @@
-package com.dite.znpt.web.controller;
-
-
-import com.dite.znpt.domain.Constants;
-import com.dite.znpt.domain.vo.ProjectCompanyListReq;
-import com.dite.znpt.domain.vo.ProjectCompanyResp;
-import com.dite.znpt.domain.entity.ProjectCompanyEntity;
-import com.dite.znpt.service.ProjectCompanyService;
-import com.dite.znpt.domain.Result;
-import com.dite.znpt.domain.PageResult;
-import com.pig4cloud.plugin.excel.annotation.RequestExcel;
-import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- */
-@Api(tags = "项目-公司关联信息")
-@RestController
-@RequestMapping("/project-company")
-public class ProjectCompanyController {
-    @Resource
-    private ProjectCompanyService projectCompanyService;
-
-    @ApiOperation(value = "获取项目-公司关联信息列表", httpMethod = "GET")
-    @GetMapping("/list")
-    public PageResult<ProjectCompanyResp> list(ProjectCompanyListReq projectCompanyReq) {
-        return PageResult.ok(projectCompanyService.selectList(projectCompanyReq));
-    }
-
-    @ApiOperation(value = "根据项目-公司关联信息Id获取详细信息", httpMethod = "GET")
-    @GetMapping("/{projectId}")
-    public Result<ProjectCompanyResp> getInfo(@PathVariable String projectId) {
-        return Result.ok(projectCompanyService.selectById(projectId));
-    }
-
-    @ApiOperation(value = "新增项目-公司关联信息", httpMethod = "POST")
-    @PostMapping
-    public Result<Object> add(@RequestBody ProjectCompanyEntity projectCompany) {
-        projectCompanyService.saveData(projectCompany);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "修改项目-公司关联信息", httpMethod = "PUT")
-    @PutMapping
-    public Result<Object> edit(@RequestBody ProjectCompanyEntity projectCompany) {
-        projectCompanyService.updateData(projectCompany);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "删除项目-公司关联信息", httpMethod = "DELETE")
-    @DeleteMapping("/{projectId}")
-    public Result<Object> remove(@PathVariable String projectId) {
-        projectCompanyService.deleteById(projectId);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "导出项目-公司关联信息", httpMethod = "GET")
-    @GetMapping("/export")
-    @ResponseExcel(name = "项目-公司关联信息")
-    public List<ProjectCompanyResp> export(ProjectCompanyListReq projectCompanyReq) {
-        return projectCompanyService.selectList(projectCompanyReq);
-    }
-
-    @ApiOperation(value = "导入项目-公司关联信息", httpMethod = "POST")
-    @PostMapping("/import")
-    public Result<Object> importData(@RequestExcel List<ProjectCompanyEntity> dataList, BindingResult bindingResult) {
-        // JSR 303 校验通用校验获取失败的数据
-        List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
-        if (errorMessageList != null && !errorMessageList.isEmpty()) {
-            return Result.error(Constants.SERVICE_EXCEPTION, "导入失败");
-        }
-        return Result.okM("导入"+dataList.size()+"条数据");
-    }
-}
-

web/src/main/java/com/dite/znpt/web/controller/TCompanyController.java

@@ -1,84 +0,0 @@
-package com.dite.znpt.web.controller;
-
-
-import com.dite.znpt.domain.Constants;
-import com.dite.znpt.domain.vo.TCompanyListReq;
-import com.dite.znpt.domain.vo.TCompanyResp;
-import com.dite.znpt.domain.entity.TCompanyEntity;
-import com.dite.znpt.service.TCompanyService;
-import com.dite.znpt.domain.Result;
-import com.dite.znpt.domain.PageResult;
-import com.pig4cloud.plugin.excel.annotation.RequestExcel;
-import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author huise23
- * @date 2025/04/11 23:17
- */
-@Api(tags = "公司信息")
-@RestController
-@RequestMapping("/t-company")
-public class TCompanyController {
-    @Resource
-    private TCompanyService tCompanyService;
-
-    @ApiOperation(value = "获取公司信息列表", httpMethod = "GET")
-    @GetMapping("/list")
-    public PageResult<TCompanyResp> list(TCompanyListReq tCompanyReq) {
-        return PageResult.ok(tCompanyService.selectList(tCompanyReq));
-    }
-
-    @ApiOperation(value = "根据公司信息Id获取详细信息", httpMethod = "GET")
-    @GetMapping("/{companyId}")
-    public Result<TCompanyResp> getInfo(@PathVariable String companyId) {
-        return Result.ok(tCompanyService.selectById(companyId));
-    }
-
-    @ApiOperation(value = "新增公司信息", httpMethod = "POST")
-    @PostMapping
-    public Result<Object> add(@RequestBody TCompanyEntity tCompany) {
-        tCompanyService.saveData(tCompany);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "修改公司信息", httpMethod = "PUT")
-    @PutMapping
-    public Result<Object> edit(@RequestBody TCompanyEntity tCompany) {
-        tCompanyService.updateData(tCompany);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "删除公司信息", httpMethod = "DELETE")
-    @DeleteMapping("/{companyId}")
-    public Result<Object> remove(@PathVariable String companyId) {
-        tCompanyService.deleteById(companyId);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "导出公司信息", httpMethod = "GET")
-    @GetMapping("/export")
-    @ResponseExcel(name = "公司信息")
-    public List<TCompanyResp> export(TCompanyListReq tCompanyReq) {
-        return tCompanyService.selectList(tCompanyReq);
-    }
-
-    @ApiOperation(value = "导入公司信息", httpMethod = "POST")
-    @PostMapping("/import")
-    public Result<Object> importData(@RequestExcel List<TCompanyEntity> dataList, BindingResult bindingResult) {
-        // JSR 303 校验通用校验获取失败的数据
-        List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
-        if (errorMessageList != null && !errorMessageList.isEmpty()) {
-            return Result.error(Constants.SERVICE_EXCEPTION, "导入失败");
-        }
-        return Result.okM("导入"+dataList.size()+"条数据");
-    }
-}
-

web/src/main/java/com/dite/znpt/web/controller/TurbineController.java

@@ -5,6 +5,7 @@ import com.dite.znpt.domain.Constants;
 import com.dite.znpt.domain.vo.TurbineListReq;
 import com.dite.znpt.domain.vo.TurbineResp;
 import com.dite.znpt.domain.entity.TurbineEntity;
+import com.dite.znpt.exception.ServiceException;
 import com.dite.znpt.service.TurbineService;
 import com.dite.znpt.domain.Result;
 import com.dite.znpt.domain.PageResult;
@@ -17,6 +18,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -31,7 +33,7 @@ public class TurbineController {
     private TurbineService turbineService;
 
     @ApiOperation(value = "获取机组-项目关联列表", httpMethod = "GET")
-    @GetMapping("/list")
+    @GetMapping({"/list", "/getByProjectId"})
     public PageResult<TurbineResp> list(TurbineListReq turbineReq) {
         return PageResult.ok(turbineService.selectList(turbineReq));
     }