From 1a5ac09469bcbe2b2363b531b4fff8093c5ac727 Mon Sep 17 00:00:00 2001 From: cs <673849330@qq,com> Date: Tue, 16 Nov 2021 18:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComponentDetailController.java | 5 +++-- .../ComponentIssuesReportController.java | 5 +++-- .../applet/biz/entity/ComponentDetail.java | 5 +++++ .../biz/service/ComponentDetailService.java | 4 +++- .../service/ComponentIssuesReportService.java | 3 ++- .../impl/ComponentDetailServiceImpl.java | 22 ++++++++++++------- .../ComponentIssuesReportServiceImpl.java | 3 ++- .../src/main/resources/application.yml | 2 +- .../mapper/ComponentDetailMapper.xml | 19 +++++++++++----- .../mapper/ComponentPictureMapper.xml | 4 ++-- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java index 073c72c..86624fb 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java @@ -70,9 +70,10 @@ public class ComponentDetailController { @ApiParam(name = "regCondName",value = "部件上报案件条件名称",required = true)@RequestParam("regCondName") String regCondName, @ApiParam(name = "issueDescription",value = "部件上报案件描述情况",required = false)@RequestParam(value = "issueDescription",required = false) String issueDescription, @ApiParam(name = "pictureIds",value = "图片id组",required = true)@RequestParam("pictureIds") List pictureIds, - @ApiParam(name = "collectorNickName",value = "采集人员昵称",required = true)@RequestParam("collectorNickName") String collectorNickName) { + @ApiParam(name = "collectorNickName",value = "采集人员昵称",required = true)@RequestParam("collectorNickName") String collectorNickName, + @ApiParam(name = "componentCollectionWays",value = "部件采集方式:1.部件采集 2.问题上报",required = true)@RequestParam("componentCollectionWays") String componentCollectionWays) { - return componentDetailService.componentAcquisition(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,patrolInspectionTime,regCondCode,regCondName,issueDescription,pictureIds,collectorNickName); + return componentDetailService.componentAcquisition(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,patrolInspectionTime,regCondCode,regCondName,issueDescription,pictureIds,collectorNickName,componentCollectionWays); } @ApiOperation(value = "获取今日巡检数，部件采集总数，上报采集总数") diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java index fd986e2..55f6437 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java @@ -69,9 +69,10 @@ public class ComponentIssuesReportController { @ApiParam(name = "regCondName",value = "部件上报案件条件名称",required = true)@RequestParam("regCondName") String regCondName, @ApiParam(name = "issueDescription",value = "部件上报案件描述情况",required = true)@RequestParam(value = "issueDescription",required = false) String issueDescription, @ApiParam(name = "pictureIds",value = "图片id组",required = true)@RequestParam("pictureIds") List pictureIds, - @ApiParam(name = "reportNickName",value = "上报人员昵称",required = true)@RequestParam("reportNickName") String reportNickName) { + @ApiParam(name = "reportNickName",value = "上报人员昵称",required = true)@RequestParam("reportNickName") String reportNickName, + @ApiParam(name = "componentCollectionWays",value = "部件采集方式:1.部件采集 2.问题上报",required = true)@RequestParam("componentCollectionWays") String componentCollectionWays) { - return componentIssuesReportService.componentReport(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,reportTime,regCondCode,regCondName,issueDescription,pictureIds,reportNickName); + return componentIssuesReportService.componentReport(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,reportTime,regCondCode,regCondName,issueDescription,pictureIds,reportNickName,componentCollectionWays); } } diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java index ed623b4..c23b86c 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java @@ -55,6 +55,9 @@ public class ComponentDetail extends BaseEntity { @ApiModelProperty(value = "巡检时间") private LocalDateTime patrolInspectionTime; + @ApiModelProperty(value = "部件采集方式:1.部件采集 2.问题上报") + private String componentCollectionWays; + public static final String COMPONENT_SUPER_NAME = "component_super_name"; @@ -78,4 +81,6 @@ public class ComponentDetail extends BaseEntity { public static final String PATROL_INSPECTION_TIME = "patrol_inspection_time"; + public static final String COMPONENT_COLLECTION_WAYS = "component_collection_ways"; + } diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java index c1917eb..bb05819 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java @@ -63,6 +63,7 @@ public interface ComponentDetailService extends IService { * @param issueDescription * @param pictureIds * @param collectorNickName + * @param componentCollectionWays * @return */ ResultBean componentAcquisition(String componentName, @@ -79,7 +80,8 @@ public interface ComponentDetailService extends IService { String regCondName, String issueDescription, List pictureIds, - String collectorNickName); + String collectorNickName, + String componentCollectionWays); /** * @Description 获取今日巡检数，部件采集总数，上报采集总数 * @Date 2021/11/3 15:27 diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java index f8dfd60..30e184d 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java @@ -55,11 +55,12 @@ public interface ComponentIssuesReportService extends IService pictureIds, String reportNickName); + ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List pictureIds, String reportNickName, String componentCollectionWays); } diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java index ebf7967..32c8236 100644 --- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java +++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java @@ -2,6 +2,8 @@ package com.hncy.service.wechat.applet.biz.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.nacos.common.utils.CollectionUtils; import com.hncy.common.dto.ResultBean; import com.hncy.common.exception.custom.BusinessException; @@ -160,13 +162,15 @@ public class ComponentDetailServiceImpl extends ServiceImpl { componentAcquisitionVo.setComponentTypeCode(componentDetail.getComponentTypeCode()); componentAcquisitionVo.setComponentTypeName(componentDetail.getComponentTypeName()); - ComponentSubsVo componentSubsVo = new ComponentSubsVo(); - BeanUtils.copyProperties(componentDetail,componentSubsVo); - ComponentIssueReportRelation componentIssueReportRelation = componentIssueReportRelationMapper.selectIssueIdByComponentId(componentDetail.getId()); - ComponentIssuesReport componentIssuesReport = componentIssuesReportMapper.selectById(componentIssueReportRelation.getComponentIssuesId()); - componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName()); - componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode()); - componentSubsVos.add(componentSubsVo); + if(ObjectUtil.isNotEmpty(componentDetail.getComponentLogo())) { + ComponentSubsVo componentSubsVo = new ComponentSubsVo(); + BeanUtils.copyProperties(componentDetail,componentSubsVo); + ComponentIssueReportRelation componentIssueReportRelation = componentIssueReportRelationMapper.selectIssueIdByComponentId(componentDetail.getId()); + ComponentIssuesReport componentIssuesReport = componentIssuesReportMapper.selectById(componentIssueReportRelation.getComponentIssuesId()); + componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName()); + componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode()); + componentSubsVos.add(componentSubsVo); + } }); Map> collect = componentSubsVos .stream() @@ -201,7 +205,8 @@ public class ComponentDetailServiceImpl extends ServiceImpl pictureIds, - String collectorNickName) { + String collectorNickName, + String componentCollectionWays) { //部件详情 ComponentDetail componentDetail = new ComponentDetail(); @@ -215,6 +220,7 @@ public class ComponentDetailServiceImpl extends ServiceImpl pictureIds, String reportNickName) { + public ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List pictureIds, String reportNickName, String componentCollectionWays) { //部件详情 ComponentDetail componentDetail = new ComponentDetail(); componentDetail.setComponentName(componentName); @@ -84,6 +84,7 @@ public class ComponentIssuesReportServiceImpl extends ServiceImpl + @@ -45,7 +46,7 @@ gmt_modified, update_by, deleted, - component_super_name, component_super_code, component_type_name, component_type_code, component_name, component_code, component_logo, component_address, x_code, y_code, patrol_inspection_time + component_super_name, component_super_code, component_type_name, component_type_code, component_name, component_code, component_logo, component_address, x_code, y_code, patrol_inspection_time, component_collection_ways UPDATE component_detail set patrol_inspection_time = #{patrolInspectionTime} @@ -65,11 +66,13 @@ SELECT COUNT(*) FROM component_detail WHERE DATEDIFF (patrol_inspection_time, NOW()) = 0 + AND component_collection_ways = '1'