From ca877877847d6ddbcde340b61deab85f00edcf51 Mon Sep 17 00:00:00 2001 From: gaoxiong Date: Tue, 6 May 2025 22:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=BE=85=E6=98=8E=E7=A1=AE=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dite/znpt/constant/Message.java | 1 + .../java/com/dite/znpt/converts/Converts.java | 10 ++- ...PersonnelEntity.java => PersonEntity.java} | 6 +- .../znpt/domain/entity/ProjectEntity.java | 8 +- ...rsonnelListReq.java => PersonListReq.java} | 2 +- .../{PersonnelResp.java => PersonResp.java} | 4 +- .../dite/znpt/domain/vo/ProjectListReq.java | 10 +-- .../com/dite/znpt/domain/vo/ProjectReq.java | 16 ++-- .../com/dite/znpt/domain/vo/ProjectResp.java | 16 ++++ .../com/dite/znpt/mapper/PersonnelMapper.java | 11 ++- .../com/dite/znpt/mapper/ProjectMapper.java | 3 +- ...rsonnelService.java => PersonService.java} | 20 ++--- ...erviceImpl.java => PersonServiceImpl.java} | 30 +++---- .../znpt/service/impl/ProjectServiceImpl.java | 81 ++++++++++++++----- .../main/resources/mapper/PersonnelMapper.xml | 2 +- .../main/resources/mapper/ProjectMapper.xml | 42 ++++------ ...lController.java => PersonController.java} | 38 ++++----- .../web/controller/ProjectController.java | 14 +++- web/src/main/resources/application-dev.yml | 6 +- 19 files changed, 191 insertions(+), 129 deletions(-) rename core/src/main/java/com/dite/znpt/domain/entity/{PersonnelEntity.java => PersonEntity.java} (87%) rename core/src/main/java/com/dite/znpt/domain/vo/{PersonnelListReq.java => PersonListReq.java} (93%) rename core/src/main/java/com/dite/znpt/domain/vo/{PersonnelResp.java => PersonResp.java} (74%) rename core/src/main/java/com/dite/znpt/service/{PersonnelService.java => PersonService.java} (67%) rename core/src/main/java/com/dite/znpt/service/impl/{PersonnelServiceImpl.java => PersonServiceImpl.java} (67%) rename web/src/main/java/com/dite/znpt/web/controller/{PersonnelController.java => PersonController.java} (63%) diff --git a/core/src/main/java/com/dite/znpt/constant/Message.java b/core/src/main/java/com/dite/znpt/constant/Message.java index 7529768..6f5babc 100644 --- a/core/src/main/java/com/dite/znpt/constant/Message.java +++ b/core/src/main/java/com/dite/znpt/constant/Message.java @@ -16,4 +16,5 @@ public class Message implements Serializable { public static final String IMAGE_PATH_IS_NOT_EXIST = "图像地址不存在"; public static final String IMAGE_ID_IS_NOT_EXIST = "图像id不存在"; public static final String DEFECT_ID_IS_NOT_EXIST = "缺陷id不存在"; + public static final String PROJECT_ID_IS_NOT_EXIST = "项目id不存在"; } diff --git a/core/src/main/java/com/dite/znpt/converts/Converts.java b/core/src/main/java/com/dite/znpt/converts/Converts.java index 55a918b..d3c3905 100644 --- a/core/src/main/java/com/dite/znpt/converts/Converts.java +++ b/core/src/main/java/com/dite/znpt/converts/Converts.java @@ -3,10 +3,8 @@ package com.dite.znpt.converts; import com.dite.znpt.domain.entity.DefectEntity; import com.dite.znpt.domain.entity.ImageCollectEntity; import com.dite.znpt.domain.entity.ImageEntity; -import com.dite.znpt.domain.vo.DefectReq; -import com.dite.znpt.domain.vo.DefectResp; -import com.dite.znpt.domain.vo.ImageCollectReq; -import com.dite.znpt.domain.vo.ImageReq; +import com.dite.znpt.domain.entity.ProjectEntity; +import com.dite.znpt.domain.vo.*; import org.mapstruct.Mapper; import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.factory.Mappers; @@ -29,4 +27,8 @@ public interface Converts { DefectEntity toDefectEntity(DefectReq req); DefectResp toDefectResp(DefectEntity entity); + + ProjectResp toProjectResp(ProjectEntity entity); + + ProjectEntity toProjectEntity(ProjectReq req); } diff --git a/core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/PersonEntity.java similarity index 87% rename from core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/PersonEntity.java index b1ac0d4..730480e 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/PersonEntity.java @@ -17,9 +17,9 @@ import com.alibaba.excel.annotation.ExcelProperty; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("personnel") -@ApiModel(value="PersonnelEntity对象", description="人员信息表") -public class PersonnelEntity extends AuditableEntity implements Serializable { +@TableName("person") +@ApiModel(value="PersonEntity对象", description="人员信息表") +public class PersonEntity extends AuditableEntity implements Serializable { private static final long serialVersionUID = -62273861742734411L; diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java index fd346ad..36d3d07 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java @@ -83,12 +83,12 @@ public class ProjectEntity extends AuditableEntity implements Serializable { private String turbineModel; @ApiModelProperty("施工人员") - @TableField("construction_personnel") - private String constructionPersonnel; + @TableField("construction_person") + private String constructionPerson; @ApiModelProperty("施工人员id") - @TableField("construction_personnel_id") - private String constructionPersonnelId; + @TableField("construction_person_id") + private String constructionPersonId; @ApiModelProperty("安全员id") @TableField("auditor_id") diff --git a/core/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/PersonListReq.java similarity index 93% rename from core/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/PersonListReq.java index 5ab3c92..8cf43c2 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/PersonListReq.java @@ -13,7 +13,7 @@ import lombok.Data; */ @Data @ApiModel("人员信息列表请求实体") -public class PersonnelListReq implements Serializable { +public class PersonListReq implements Serializable { private static final long serialVersionUID = -10363935468256543L; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java b/core/src/main/java/com/dite/znpt/domain/vo/PersonResp.java similarity index 74% rename from core/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/PersonResp.java index c66e1fa..587c10c 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/PersonResp.java @@ -3,7 +3,7 @@ package com.dite.znpt.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; -import com.dite.znpt.domain.entity.PersonnelEntity; +import com.dite.znpt.domain.entity.PersonEntity; /** * @author huise23 @@ -13,6 +13,6 @@ import com.dite.znpt.domain.entity.PersonnelEntity; @Data @EqualsAndHashCode(callSuper = true) @ApiModel("人员信息响应实体") -public class PersonnelResp extends PersonnelEntity { +public class PersonResp extends PersonEntity { } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java index 6f7343c..46ad94b 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java @@ -1,6 +1,7 @@ package com.dite.znpt.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,9 +20,6 @@ public class ProjectListReq implements Serializable { private static final long serialVersionUID = -74121355744234753L; - @ApiModelProperty("查询关键字") - private String keyword; - @ApiModelProperty("项目名称") private String projectName; @@ -37,11 +35,13 @@ public class ProjectListReq implements Serializable { @ApiModelProperty("项目状态，枚举：ProjectStatusEnum") private String status; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("创建日期-起") - private LocalDate createDateBegin; + private String createDateBegin; + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("创建日期-讫") - private LocalDate createDateEnd; + private String createDateEnd; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java index 67a517f..c59c45e 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java @@ -1,5 +1,6 @@ package com.dite.znpt.domain.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,15 +20,18 @@ public class ProjectReq implements Serializable { @Serial private static final long serialVersionUID = 740685592879189406L; + @ExcelProperty("项目名称") @ApiModelProperty("项目名称") private String projectName; @ApiModelProperty("项目封面") private String coverUrl; + @ExcelProperty("风场名称") @ApiModelProperty("风场名称") private String farmName; + @ExcelProperty("风场地址") @ApiModelProperty("风场地址") private String farmAddress; @@ -49,17 +53,19 @@ public class ProjectReq implements Serializable { @ApiModelProperty("检查单位联系电话") private String inspectionPhone; + @ExcelProperty("项目规模") @ApiModelProperty("项目规模") private String scale; + @ExcelProperty("风机型号") @ApiModelProperty("风机型号") private String turbineModel; - @ApiModelProperty("施工人员") - private String constructionPersonnel; - @ApiModelProperty("施工人员id") - private String constructionPersonnelId; + private String constructionPersonId; + + @ApiModelProperty("施工人员") + private String constructionPersonName; @ApiModelProperty("安全员id") private String auditorId; @@ -89,7 +95,7 @@ public class ProjectReq implements Serializable { private String discloseContent; @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收") - private Integer status; + private String status; @ApiModelProperty("项目工作类型 可能有多项，逗号分隔") private String workType; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java index eff73b7..8bdfd18 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java @@ -26,7 +26,23 @@ public class ProjectResp extends ProjectReq implements Serializable { @Serial private static final long serialVersionUID = -1883901559600186726L; + @ExcelProperty("项目id") @ApiModelProperty("项目id") private String projectId; + + @ApiModelProperty("安全员") + private String auditorName; + + @ApiModelProperty("质量员") + private String qualityOfficerName; + + @ApiModelProperty("项目经理") + private String projectManagerName; + + @ApiModelProperty("施工组长") + private String constructionTeamLeaderName; + + @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收") + private String statusLabel; } diff --git a/core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java b/core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java index dbe7318..5a8d6d7 100644 --- a/core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java +++ b/core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java @@ -1,10 +1,9 @@ package com.dite.znpt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dite.znpt.domain.entity.PersonnelEntity; -import com.dite.znpt.domain.vo.PersonnelListReq; -import com.dite.znpt.domain.vo.PersonnelResp; -import org.apache.ibatis.annotations.Param; +import com.dite.znpt.domain.entity.PersonEntity; +import com.dite.znpt.domain.vo.PersonListReq; +import com.dite.znpt.domain.vo.PersonResp; import java.util.List; @@ -13,7 +12,7 @@ import java.util.List; * @date 2025/04/11 23:17 * @Description: 人员信息表数据库访问层 */ -public interface PersonnelMapper extends BaseMapper { - List queryBySelective(PersonnelListReq personnelReq); +public interface PersonnelMapper extends BaseMapper { + List queryBySelective(PersonListReq personnelReq); } diff --git a/core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java b/core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java index 5616a49..c1bebbf 100644 --- a/core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java +++ b/core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java @@ -3,6 +3,7 @@ package com.dite.znpt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.vo.ProjectListReq; +import com.dite.znpt.domain.vo.ProjectListResp; import com.dite.znpt.domain.vo.ProjectResp; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,6 @@ import java.util.List; * @Description: 项目信息表数据库访问层 */ public interface ProjectMapper extends BaseMapper { - List queryBySelective(ProjectListReq projectReq); + List queryBySelective(ProjectListReq projectReq); } diff --git a/core/src/main/java/com/dite/znpt/service/PersonnelService.java b/core/src/main/java/com/dite/znpt/service/PersonService.java similarity index 67% rename from core/src/main/java/com/dite/znpt/service/PersonnelService.java rename to core/src/main/java/com/dite/znpt/service/PersonService.java index 2717734..6a7ac97 100644 --- a/core/src/main/java/com/dite/znpt/service/PersonnelService.java +++ b/core/src/main/java/com/dite/znpt/service/PersonService.java @@ -1,9 +1,9 @@ package com.dite.znpt.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.dite.znpt.domain.entity.PersonnelEntity; -import com.dite.znpt.domain.vo.PersonnelListReq; -import com.dite.znpt.domain.vo.PersonnelResp; +import com.dite.znpt.domain.entity.PersonEntity; +import com.dite.znpt.domain.vo.PersonListReq; +import com.dite.znpt.domain.vo.PersonResp; import java.util.List; @@ -12,27 +12,27 @@ import java.util.List; * @date 2025/04/11 23:17 * @Description: 人员信息表服务接口 */ -public interface PersonnelService extends IService { +public interface PersonService extends IService { /** * 功能描述：查询人员信息列表 * * @param personnelReq 人员信息 - * @return {@link List }<{@link PersonnelEntity }> + * @return {@link List }<{@link PersonEntity }> * @author huise23 * @date 2025/04/11 23:17 **/ - List selectList(PersonnelListReq personnelReq); + List selectList(PersonListReq personnelReq); /** * 功能描述：查询单条人员信息 * * @param personId 人员信息Id - * @return {@link PersonnelResp } + * @return {@link PersonResp } * @author huise23 * @date 2025/04/11 23:17 **/ - PersonnelResp selectById(String personId); + PersonResp selectById(String personId); /** * 功能描述：新增人员信息 @@ -41,7 +41,7 @@ public interface PersonnelService extends IService { * @author huise23 * @date 2025/04/11 23:17 **/ - void saveData(PersonnelEntity personnel); + void saveData(PersonEntity personnel); /** * 功能描述：更新人员信息 @@ -50,7 +50,7 @@ public interface PersonnelService extends IService { * @author huise23 * @date 2025/04/11 23:17 **/ - void updateData(PersonnelEntity personnel); + void updateData(PersonEntity personnel); /** * 功能描述：删除人员信息 diff --git a/core/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/PersonServiceImpl.java similarity index 67% rename from core/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/PersonServiceImpl.java index f352d90..e28061c 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/PersonServiceImpl.java @@ -1,10 +1,10 @@ package com.dite.znpt.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dite.znpt.domain.entity.PersonnelEntity; -import com.dite.znpt.domain.vo.PersonnelListReq; -import com.dite.znpt.domain.vo.PersonnelResp; -import com.dite.znpt.service.PersonnelService; +import com.dite.znpt.domain.entity.PersonEntity; +import com.dite.znpt.domain.vo.PersonListReq; +import com.dite.znpt.domain.vo.PersonResp; +import com.dite.znpt.service.PersonService; import com.dite.znpt.mapper.PersonnelMapper; import org.springframework.stereotype.Service; import cn.hutool.core.collection.CollUtil; @@ -20,20 +20,20 @@ import java.util.List; */ @Service @RequiredArgsConstructor -public class PersonnelServiceImpl extends ServiceImpl implements PersonnelService { +public class PersonServiceImpl extends ServiceImpl implements PersonService { /** * 功能描述：查询人员信息列表 * * @param personnelReq 人员信息信息 - * @return {@link List }<{@link PersonnelResp }> + * @return {@link List }<{@link PersonResp }> * @author huise23 * @date 2025/04/11 23:17 **/ @Override - public List selectList(PersonnelListReq personnelReq) { + public List selectList(PersonListReq personnelReq) { PageUtil.startPage(); - List personnelList= this.baseMapper.queryBySelective(personnelReq); + List personnelList= this.baseMapper.queryBySelective(personnelReq); personnelList.forEach(resp -> { }); @@ -44,17 +44,17 @@ public class PersonnelServiceImpl extends ServiceImpl list = selectList(personnelReq); - return list.isEmpty() ? CollUtil.getFirst(list) : new PersonnelResp(); + List list = selectList(personnelReq); + return list.isEmpty() ? CollUtil.getFirst(list) : new PersonResp(); } /** @@ -65,7 +65,7 @@ public class PersonnelServiceImpl extends ServiceImpl implements ProjectService { + @Resource + private PersonService personService; /** * 功能描述：查询项目信息列表 * - * @param projectReq 项目信息信息 + * @param req 项目信息信息 * @return {@link List }<{@link ProjectResp }> * @author huise23 * @date 2025/04/11 23:17 **/ @Override - public List page(ProjectListReq projectReq) { + public List page(ProjectListReq req) { PageUtil.startPage(); - List projectList= this.baseMapper.queryBySelective(projectReq); - projectList.forEach(resp -> { - - }); - return null; + return this.list(req); } @Override - public List list(ProjectListReq projectReq) { - List projectList= this.baseMapper.queryBySelective(projectReq); - projectList.forEach(resp -> { - + public List list(ProjectListReq req) { + List list= this.baseMapper.queryBySelective(req); + list.forEach(resp -> { + resp.setStatusLabel(ProjectStatusEnum.getDescByCode(resp.getStatus())); }); - return null; + return list; } /** @@ -62,8 +73,35 @@ public class ProjectServiceImpl extends ServiceImpl personIds = new ArrayList<>(); + if(StrUtil.isNotEmpty(resp.getAuditorId())){ + personIds.add(resp.getAuditorId()); + } + if(StrUtil.isNotEmpty(resp.getQualityOfficerId())){ + personIds.add(resp.getQualityOfficerId()); + } + if(StrUtil.isNotEmpty(resp.getConstructionTeamLeaderId())){ + personIds.add(resp.getConstructionTeamLeaderId()); + } + if(StrUtil.isNotEmpty(resp.getProjectManagerId())){ + personIds.add(resp.getProjectManagerId()); + } + if(CollUtil.isNotEmpty(personIds)){ + Map personIdMap = personService.listByIds(personIds).stream().collect(Collectors.toMap(k->k.getPersonId(), Function.identity())); + if(CollUtil.isNotEmpty(personIdMap)){ + resp.setAuditorName(personIdMap.containsKey(resp.getAuditorId()) ? personIdMap.get(resp.getAuditorId()).getName() : null); + resp.setProjectManagerName(personIdMap.containsKey(resp.getProjectManagerId()) ? personIdMap.get(resp.getProjectManagerId()).getName() : null); + resp.setConstructionTeamLeaderName(personIdMap.containsKey(resp.getConstructionTeamLeaderId()) ? personIdMap.get(resp.getConstructionTeamLeaderId()).getName() : null); + resp.setQualityOfficerName(personIdMap.containsKey(resp.getQualityOfficerId()) ? personIdMap.get(resp.getQualityOfficerId()).getName() : null); + } + } + return resp; } /** @@ -76,8 +114,8 @@ public class ProjectServiceImpl extends ServiceImpl - select from personnel a diff --git a/core/src/main/resources/mapper/ProjectMapper.xml b/core/src/main/resources/mapper/ProjectMapper.xml index d3b28cc..76d66a5 100644 --- a/core/src/main/resources/mapper/ProjectMapper.xml +++ b/core/src/main/resources/mapper/ProjectMapper.xml @@ -2,42 +2,32 @@ - - a.project_id, a.project_name, a.farm_name, a.farm_address, - a.method_id, a.scale, a.turbine_model, a.status - - + SELECT + prj.project_id, prj.project_name, prj.farm_name, prj.status, prj.cover_url, prj.farm_address, prj.client, prj.client_contact, prj.client_phone, prj.inspection_unit, + prj.inspection_contact, prj.inspection_phone, prj.scale, prj.turbine_model, prj.project_manager_id, pm.name AS project_manager_name, prj.construction_person_id, prj.construction_person_name , prj.create_time + FROM project prj + LEFT JOIN person pm ON pm.person_id = prj.project_manager_id - -# and (a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%') or a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%')) - - - and a.project_id like concat ('%', #{projectId}, '%') - - and a.project_name like concat ('%', #{projectName}, '%') + AND prj.project_name LIKE concat ('%', #{projectName}, '%') - and a.farm_name like concat ('%', #{farmName}, '%') + AND prj.farm_name LIKE concat ('%', #{farmName}, '%') - and a.farm_address like concat ('%', #{farmAddress}, '%') + AND prj.farm_address LIKE concat ('%', #{farmAddress}, '%') - - and a.method_id like concat ('%', #{methodId}, '%') - - - and a.scale like concat ('%', #{scale}, '%') - - - and a.turbine_model like concat ('%', #{turbineModel}, '%') + + AND prj.client LIKE concat ('%', #{client}, '%') - and a.status like concat ('%', #{status}, '%') + AND prj.status = #{status} + + + AND prj.create_time BETWEEN #{createDateBegin} AND #{createDateEnd} diff --git a/web/src/main/java/com/dite/znpt/web/controller/PersonnelController.java b/web/src/main/java/com/dite/znpt/web/controller/PersonController.java similarity index 63% rename from web/src/main/java/com/dite/znpt/web/controller/PersonnelController.java rename to web/src/main/java/com/dite/znpt/web/controller/PersonController.java index 6b83171..f1d82f8 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/PersonnelController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/PersonController.java @@ -2,10 +2,10 @@ package com.dite.znpt.web.controller; import com.dite.znpt.domain.Constants; -import com.dite.znpt.domain.vo.PersonnelListReq; -import com.dite.znpt.domain.vo.PersonnelResp; -import com.dite.znpt.domain.entity.PersonnelEntity; -import com.dite.znpt.service.PersonnelService; +import com.dite.znpt.domain.vo.PersonListReq; +import com.dite.znpt.domain.vo.PersonResp; +import com.dite.znpt.domain.entity.PersonEntity; +import com.dite.znpt.service.PersonService; import com.dite.znpt.domain.Result; import com.dite.znpt.domain.PageResult; import com.pig4cloud.plugin.excel.annotation.RequestExcel; @@ -25,54 +25,54 @@ import java.util.List; */ @Api(tags = "人员信息") @RestController -@RequestMapping("/personnel") -public class PersonnelController { +@RequestMapping("/person") +public class PersonController { @Resource - private PersonnelService personnelService; + private PersonService personService; @ApiOperation(value = "获取人员信息列表", httpMethod = "GET") @GetMapping("/list") - public PageResult list(PersonnelListReq personnelReq) { - return PageResult.ok(personnelService.selectList(personnelReq)); + public PageResult list(PersonListReq personnelReq) { + return PageResult.ok(personService.selectList(personnelReq)); } @ApiOperation(value = "根据人员信息Id获取详细信息", httpMethod = "GET") @GetMapping("/{personId}") - public Result getInfo(@PathVariable String personId) { - return Result.ok(personnelService.selectById(personId)); + public Result getInfo(@PathVariable String personId) { + return Result.ok(personService.selectById(personId)); } @ApiOperation(value = "新增人员信息", httpMethod = "POST") @PostMapping - public Result add(@RequestBody PersonnelEntity personnel) { - personnelService.saveData(personnel); + public Result add(@RequestBody PersonEntity personnel) { + personService.saveData(personnel); return Result.ok(); } @ApiOperation(value = "修改人员信息", httpMethod = "PUT") @PutMapping - public Result edit(@RequestBody PersonnelEntity personnel) { - personnelService.updateData(personnel); + public Result edit(@RequestBody PersonEntity personnel) { + personService.updateData(personnel); return Result.ok(); } @ApiOperation(value = "删除人员信息", httpMethod = "DELETE") @DeleteMapping("/{personId}") public Result remove(@PathVariable String personId) { - personnelService.deleteById(personId); + personService.deleteById(personId); return Result.ok(); } @ApiOperation(value = "导出人员信息", httpMethod = "GET") @GetMapping("/export") @ResponseExcel(name = "人员信息") - public List export(PersonnelListReq personnelReq) { - return personnelService.selectList(personnelReq); + public List export(PersonListReq personnelReq) { + return personService.selectList(personnelReq); } @ApiOperation(value = "导入人员信息", httpMethod = "POST") @PostMapping("/import") - public Result importData(@RequestExcel List dataList, BindingResult bindingResult) { + public Result importData(@RequestExcel List dataList, BindingResult bindingResult) { // JSR 303 校验通用校验获取失败的数据 List errorMessageList = (List) bindingResult.getTarget(); if (errorMessageList != null && !errorMessageList.isEmpty()) { diff --git a/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java b/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java index 7061609..182e0b1 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java @@ -32,12 +32,18 @@ public class ProjectController { @Resource private ProjectService projectService; - @ApiOperation(value = "获取项目信息列表", httpMethod = "GET") + @ApiOperation(value = "分页查询项目信息列表", httpMethod = "GET") @GetMapping("/page") - public PageResult page(@RequestBody ProjectListReq req) { + public PageResult page(ProjectListReq req) { return PageResult.ok(projectService.page(req)); } + @ApiOperation(value = "查询项目信息列表", httpMethod = "GET") + @GetMapping("/list") + public Result> list(ProjectListReq req) { + return Result.ok(projectService.list(req)); + } + @ApiOperation(value = "查询项目信息详细信息", httpMethod = "GET") @GetMapping("/detail/{projectId}") public Result detail(@PathVariable String projectId) { @@ -65,14 +71,14 @@ public class ProjectController { return Result.ok(); } - @ApiOperation(value = "导出项目信息", httpMethod = "GET") + @ApiOperation(value = "导出项目信息-需求待明确", httpMethod = "GET") @GetMapping("/export") @ResponseExcel(name = "项目信息") public List export(ProjectListReq req) { return null; } - @ApiOperation(value = "导入项目信息", httpMethod = "POST") + @ApiOperation(value = "导入项目信息-需求待明确", httpMethod = "POST") @PostMapping("/import") public Result importData(@RequestExcel List dataList, BindingResult bindingResult) { // JSR 303 校验通用校验获取失败的数据 diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index f4933c6..e2663b3 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -84,7 +84,7 @@ spring: sip-config: name: 信令服务 - ip: 192.168.0.207 + ip: 192.168.0.112 port: 1074 charset: gb2312 domain: 3402000000 @@ -100,7 +100,7 @@ zlm-config: # 公网ip publicHost: # 接口ip - apiHost: 192.168.0.207 + apiHost: 192.168.0.112 # 接口端口 apiPort: 8080 # 密钥 @@ -108,7 +108,7 @@ zlm-config: # 流id前缀 streamPrefix: # rtp ip - rtpHost: 192.168.0.207 + rtpHost: 192.168.0.112 # rtp 端口 rtpPort: 8080 # 动态端口起始值