From e66dc528588964e5533f0ed9f0d3d98f7555cbbe Mon Sep 17 00:00:00 2001 From: zhaowenyuan Date: Fri, 28 Jun 2024 18:17:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A1=E6=A3=80=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/po/InspectionConfig.java | 10 +-- .../inspection/project/po/InspectionData.java | 33 +--------- .../project/po/InspectionDetail.java | 8 --- .../inspection/project/vo/DetailsVO.java | 4 ++ .../inspection/work/vo/ConfigDataVO.java | 49 +++++++++++++++ .../work/vo/InspectionConfigVO.java | 28 +++------ .../project/mapper/InspectionDataMapper.java | 8 +++ .../service/InspectionDataService.java | 4 ++ .../impl/InspectionDataServiceImpl.java | 16 ++++- .../work/service/impl/WrkInfoServiceImpl.java | 5 +- .../resources/mapper/InspectionDataMapper.xml | 63 ++++++++++++------- 11 files changed, 139 insertions(+), 89 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/ConfigDataVO.java diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java index aa7ed37..947c268 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java @@ -33,7 +33,6 @@ public class InspectionConfig extends BaseEntity { @NotNull(message = "配置id 不能为空", groups = Update.class) @Null(message = "配置id 必须为空", groups = Create.class) private Long configId; - /** * 任务id */ @@ -41,20 +40,17 @@ public class InspectionConfig extends BaseEntity { @Condition(name = "task_id", type = Condition.ConditionType.eq) @NotNull(message = "所属任务不能为空", groups = Create.class) private Long taskId; - /** * 对应部门Id */ @TableField(value = "dept_id") private Long deptId; - /** * 配置名称 name */ @TableField(value = "config_name") @Condition(name = "config_name", type = Condition.ConditionType.eq) private String configName; - /** * 配置别名 */ @@ -62,7 +58,6 @@ public class InspectionConfig extends BaseEntity { @Condition(name = "`alias`", type = Condition.ConditionType.eq) @NotNull(message = "巡检单别名不能为空", groups = {Update.class,Create.class}) private String alias; - /** * 模板名称 */ @@ -70,4 +65,9 @@ public class InspectionConfig extends BaseEntity { @Condition(name = "`template`", type = Condition.ConditionType.eq) @NotNull(message = "巡检单模板名称不能为空", groups = {Update.class,Create.class}) private String template; + /** + * 模板所属路径 + */ + @TableField(value = "template_url") + private String templateUrl; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java index 9673ef1..ab68f4f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** + * 这里才是对应的data * @auther: zhao * @date: 2024/6/18 15:39 */ @@ -25,12 +26,6 @@ public class InspectionData extends BaseEntity { */ @TableId(value = "data_id", type = IdType.ASSIGN_ID) private Long dataId; - - /** - * 任务id - */ - @TableField(value = "config_id") - private Long configId; /** * 详情id */ @@ -41,40 +36,14 @@ public class InspectionData extends BaseEntity { */ @TableField(value = "ins_id") private Long insId; - - /** - * 对应部门Id - */ - @TableField(value = "dept_id") - private Long deptId; - - /** - * 配置对应key - */ - @TableField(value = "config_key") - private String configKey; - /** * 配置对应value */ @TableField(value = "config_value") private String configValue; - - /** - * key 对应类型 - */ - @TableField(value = "config_type") - private Short configType; - /** * 备注 */ @TableField(value = "remark") private String remark; - - /** - * 对应模板别名 - */ - @TableField(value = "`alias`") - private String alias; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java index 5ad35d3..46024ac 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java @@ -37,13 +37,6 @@ public class InspectionDetail extends BaseEntity { @TableField(value = "config_id") @NotNull(message = "config_id 不能为空", groups = {Create.class, Update.class}) private Long configId; - - /** - * 对应部门Id - */ - @TableField(value = "dept_id") - private Long deptId; - /** * 配置对应label */ @@ -56,7 +49,6 @@ public class InspectionDetail extends BaseEntity { @TableField(value = "config_key") @NotNull(message = "config_key 不能为空", groups = {Create.class, Update.class}) private String configKey; - /** * key 对应类型 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java index 1b88cbb..dca7e8b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java @@ -32,6 +32,10 @@ public class DetailsVO implements Serializable { * 配置对应key */ private String configKey; + /** + * 对应的配置值 + */ + private String configValue; /** * key 对应类型 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/ConfigDataVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/ConfigDataVO.java new file mode 100644 index 0000000..6c4a143 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/ConfigDataVO.java @@ -0,0 +1,49 @@ +package com.chushang.inspection.work.vo; + +import lombok.Data; + +/** + * 电子巡检单对应 数值 + * @auther: zhao + * @date: 2024/6/28 17:58 + */ +@Data +public class ConfigDataVO { + /** + * 数据id + */ + private Long dataId; + /** + * 工单id + */ + private String wrkId; + /** + * data + * key 对应值 + */ + private String configValue; + /** + * data + * 备注信息 + */ + private String remark; + /** + * detail + * 详情id + */ + private Long detailId; + /** + * key + */ + private String configKey; + /** + * 类型 + */ + private Integer configType; + /** + * label + */ + private String configLabel; + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/InspectionConfigVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/InspectionConfigVO.java index 30e56a2..1b933ab 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/InspectionConfigVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/InspectionConfigVO.java @@ -1,6 +1,5 @@ package com.chushang.inspection.work.vo; -import com.chushang.inspection.project.vo.DetailsVO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,35 +16,28 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class InspectionConfigVO implements Serializable { - /** * 配置id */ - private Long inspectionConfig; - + private Long configId; /** - * 名称 + * 配置名称 */ - private String name; - + private String configName; /** - * 别名 + * 模板别名 */ private String alias; - + /** + * 模板名称 + */ + private String template; /** * 模板路径 */ - private String template; - + private String templateUrl; /** * 详细信息 */ -// @RelationOneToMany( -// selfField = "inspectionConfig", -// targetField = "inspectionConfig", -// targetTable = "inspection_details", -// selectColumns = {"id", "inspection_config", "label", "value as configValue"} -// ) - private List details; + private List details; } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java index f3f29c2..7979feb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java @@ -1,11 +1,19 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.datascope.annotation.DataScope; import com.chushang.inspection.project.po.InspectionData; +import com.chushang.inspection.work.vo.InspectionConfigVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @auther: zhao * @date: 2024/6/18 15:39 */ public interface InspectionDataMapper extends BaseMapper { + @DataScope(deptAlias = "ic") + List listInspections(@Param("wrkId") Long wrkId, @Param("query") CommonParam query); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java index 99a63fb..61a6d13 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java @@ -2,6 +2,9 @@ package com.chushang.inspection.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.inspection.project.po.InspectionData; +import com.chushang.inspection.work.vo.InspectionConfigVO; + +import java.util.List; /** * @auther: zhao @@ -10,4 +13,5 @@ import com.chushang.inspection.project.po.InspectionData; public interface InspectionDataService extends IService{ + List listInspections(Long wrkId); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java index f511508..cc9ff86 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java @@ -1,15 +1,29 @@ package com.chushang.inspection.project.service.impl; +import com.chushang.common.mybatis.page.CommonParam; import com.chushang.inspection.project.service.InspectionDataService; +import com.chushang.inspection.work.vo.InspectionConfigVO; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.po.InspectionData; import com.chushang.inspection.project.mapper.InspectionDataMapper; + +import java.util.List; + /** * @auther: zhao * @date: 2024/6/18 15:39 */ @Service public class InspectionDataServiceImpl extends ServiceImpl implements InspectionDataService { - + /** + * 根据工单id 查询对应的 巡检单信息 + * @param wrkId + * @return + */ + @Override + public List listInspections(Long wrkId) { + CommonParam commonParam = CommonParam.buildPageRequest(); + return baseMapper.listInspections(wrkId, commonParam); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index d643724..4774a58 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -35,8 +35,6 @@ import com.chushang.inspection.work.mapper.WrkInfoMapper; import javax.annotation.Resource; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @auther: zhao @@ -130,7 +128,8 @@ public class WrkInfoServiceImpl extends ServiceImpl impl .eq(WrkImg::getImgType, -1) .last(Operator.LIMIT_ONE.getCharacter())).getRealPath()); } - // todo 巡检单还没搞 + // 巡检单还没搞 + infoDetail.setInspections(inspectionDataService.listInspections(wrkId)); return infoDetail; } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml index 5e45bc6..60550c7 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml @@ -1,27 +1,46 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - data_id, config_id, dept_id, config_key, config_value, config_type, remark, `alias`, - version, del_state, create_by, create_time, update_by, update_time - + +