1.动态tab

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPropertyfieldEntity.java

@@ -40,7 +40,7 @@ public class BasicPropertyfieldEntity extends TenantEntity {
 	 * 预留1
 	 */
 	@ApiModelProperty(value = "预留1")
-	private String reserve1;
+	private String node;
 	/**
 	 * 预留2
 	 */

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPropertyvalueEntity.java

@@ -0,0 +1,96 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 资产值表 实体类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@Data
+@TableName("logpm_basic_propertyvalue")
+@ApiModel(value = "BasicPropertyvalue对象", description = "资产值表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicPropertyvalueEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 资产表id
+	 */
+	@ApiModelProperty(value = "资产表id")
+	private Long masterId;
+	/**
+	 * 资产字段表id
+	 */
+	@ApiModelProperty(value = "资产字段表id")
+	private Long fieldId;
+	/**
+	 * data值
+	 */
+	@ApiModelProperty(value = "data值")
+	private Date dataValue;
+	/**
+	 * int值
+	 */
+	@ApiModelProperty(value = "int值")
+	private Integer intValue;
+	/**
+	 * double值
+	 */
+	@ApiModelProperty(value = "double值")
+	private BigDecimal doubleValue;
+	/**
+	 * string值
+	 */
+	@ApiModelProperty(value = "string值")
+	private String stringValue;
+
+}

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPropertyvalueClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 资产值表 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_BASIC_NAME
+)
+public interface IBasicPropertyvalueClient {
+
+    String API_PREFIX = "propertyvalue/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取资产值表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicPropertyvalueEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicPropertyvalueVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.vo;
+
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 资产值表 视图实体类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicPropertyvalueVO extends BasicPropertyvalueEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyController.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.controller;
 
 import com.logpm.basic.dto.BasicPropertyDTO;
+import com.logpm.basic.service.IBasicPropertyfieldService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -55,10 +57,13 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/property")
 @Api(value = "资产", tags = "资产接口")
+@Slf4j
 public class BasicPropertyController extends BladeController {
 
 	private final IBasicPropertyService basicPropertyService;
 
+	private final IBasicPropertyfieldService basicPropertyfieldService;
+
 	/**
 	 * 资产 详情
 	 */
@@ -98,7 +103,13 @@ public class BasicPropertyController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicProperty")
 	public R save(@Valid @RequestBody BasicPropertyDTO basicProperty) {
-		return R.status(basicPropertyService.save(basicProperty));
+		log.info("接收参数>>>>>>>>>>>>>>{}",basicProperty);
+		boolean flag = basicPropertyService.save(basicProperty);
+		if (flag){
+		//存入字段信息
+		return R.status(basicPropertyfieldService.savefiled(basicProperty));
+		}
+		return R.status(false);
 	}
 
 	/**

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyfieldController.java

@@ -52,7 +52,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("basicPropertyfield/basicPropertyfield")
+@RequestMapping("/propertyfield")
 @Api(value = "资产字段表", tags = "资产字段表接口")
 public class BasicPropertyfieldController extends BladeController {
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyvalueController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.vo.BasicPropertyvalueVO;
+import com.logpm.basic.excel.BasicPropertyvalueExcel;
+import com.logpm.basic.service.IBasicPropertyvalueService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 资产值表 控制器
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("basicPropertyvalue/basicPropertyvalue")
+@Api(value = "资产值表", tags = "资产值表接口")
+public class BasicPropertyvalueController extends BladeController {
+
+	private final IBasicPropertyvalueService basicPropertyvalueService;
+
+	/**
+	 * 资产值表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicPropertyvalue")
+	public R<BasicPropertyvalueEntity> detail(BasicPropertyvalueEntity basicPropertyvalue) {
+		BasicPropertyvalueEntity detail = basicPropertyvalueService.getOne(Condition.getQueryWrapper(basicPropertyvalue));
+		return R.data(detail);
+	}
+	/**
+	 * 资产值表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicPropertyvalue")
+	public R<IPage<BasicPropertyvalueEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicPropertyvalue, Query query) {
+		IPage<BasicPropertyvalueEntity> pages = basicPropertyvalueService.page(Condition.getPage(query), Condition.getQueryWrapper(basicPropertyvalue, BasicPropertyvalueEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 资产值表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicPropertyvalue")
+	public R<IPage<BasicPropertyvalueVO>> page(BasicPropertyvalueVO basicPropertyvalue, Query query) {
+		IPage<BasicPropertyvalueVO> pages = basicPropertyvalueService.selectBasicPropertyvaluePage(Condition.getPage(query), basicPropertyvalue);
+		return R.data(pages);
+	}
+
+	/**
+	 * 资产值表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicPropertyvalue")
+	public R save(@Valid @RequestBody BasicPropertyvalueEntity basicPropertyvalue) {
+		return R.status(basicPropertyvalueService.save(basicPropertyvalue));
+	}
+
+	/**
+	 * 资产值表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicPropertyvalue")
+	public R update(@Valid @RequestBody BasicPropertyvalueEntity basicPropertyvalue) {
+		return R.status(basicPropertyvalueService.updateById(basicPropertyvalue));
+	}
+
+	/**
+	 * 资产值表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicPropertyvalue")
+	public R submit(@Valid @RequestBody BasicPropertyvalueEntity basicPropertyvalue) {
+		return R.status(basicPropertyvalueService.saveOrUpdate(basicPropertyvalue));
+	}
+
+	/**
+	 * 资产值表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicPropertyvalueService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicPropertyvalue")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicPropertyvalue")
+	public void exportBasicPropertyvalue(@ApiIgnore @RequestParam Map<String, Object> basicPropertyvalue, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicPropertyvalueEntity> queryWrapper = Condition.getQueryWrapper(basicPropertyvalue, BasicPropertyvalueEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicPropertyvalue::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicPropertyvalueEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicPropertyvalueExcel> list = basicPropertyvalueService.exportBasicPropertyvalue(queryWrapper);
+		ExcelUtil.export(response, "资产值表数据" + DateUtil.time(), "资产值表数据表", list, BasicPropertyvalueExcel.class);
+	}
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPropertyDTO.java

@@ -39,7 +39,7 @@ public class BasicPropertyDTO extends BasicPropertyEntity {
 	 * 字段表
 	 */
 	@ApiModelProperty(value = "字段表")
-	private List<BasicPropertyfieldDTO>  field;
+	private List<BasicPropertyfieldEntity>  field;
 
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPropertyvalueDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.dto;
+
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 资产值表 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicPropertyvalueDTO extends BasicPropertyvalueEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicPropertyvalueExcel.java

@@ -0,0 +1,124 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 资产值表 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicPropertyvalueExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 资产表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("资产表id")
+	private Long masterId;
+	/**
+	 * 资产字段表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("资产字段表id")
+	private Long fieldId;
+	/**
+	 * data值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("data值")
+	private Date dataValue;
+	/**
+	 * int值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("int值")
+	private Integer intValue;
+	/**
+	 * double值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("double值")
+	private BigDecimal doubleValue;
+	/**
+	 * string值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("string值")
+	private String stringValue;
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPropertyvalueClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.service.IBasicPropertyvalueService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 资产值表 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicPropertyvalueClient implements IBasicPropertyvalueClient {
+
+    private final IBasicPropertyvalueService basicPropertyvalueService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicPropertyvalueEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicPropertyvalueEntity> page = basicPropertyvalueService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPropertyfieldMapper.xml

@@ -13,7 +13,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="create_dept" property="createDept"/>
-        <result column="reserve1" property="reserve1"/>
+        <result column="node" property="node"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>
         <result column="reserve4" property="reserve4"/>

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPropertyvalueMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.mapper;
+
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.vo.BasicPropertyvalueVO;
+import com.logpm.basic.excel.BasicPropertyvalueExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 资产值表 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+public interface BasicPropertyvalueMapper extends BaseMapper<BasicPropertyvalueEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicPropertyvalue
+	 * @return
+	 */
+	List<BasicPropertyvalueVO> selectBasicPropertyvaluePage(IPage page, BasicPropertyvalueVO basicPropertyvalue);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicPropertyvalueExcel> exportBasicPropertyvalue(@Param("ew") Wrapper<BasicPropertyvalueEntity> queryWrapper);
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPropertyvalueMapper.xml

@@ -0,0 +1,39 @@
+<?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.logpm.basic.mapper.BasicPropertyvalueMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicPropertyvalueResultMap" type="com.logpm.basic.entity.BasicPropertyvalueEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="master_id" property="masterId"/>
+        <result column="field_id" property="fieldId"/>
+        <result column="data_value" property="dataValue"/>
+        <result column="int_value" property="intValue"/>
+        <result column="double_value" property="doubleValue"/>
+        <result column="string_value" property="stringValue"/>
+    </resultMap>
+
+
+    <select id="selectBasicPropertyvaluePage" resultMap="basicPropertyvalueResultMap">
+        select * from logpm_basic_propertyvalue where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicPropertyvalue" resultType="com.logpm.basic.excel.BasicPropertyvalueExcel">
+        SELECT * FROM logpm_basic_propertyvalue ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPropertyfieldService.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basic.dto.BasicPropertyDTO;
 import com.logpm.basic.entity.BasicPropertyfieldEntity;
 import com.logpm.basic.vo.BasicPropertyfieldVO;
 import com.logpm.basic.excel.BasicPropertyfieldExcel;
@@ -48,5 +49,10 @@ public interface IBasicPropertyfieldService extends BaseService<BasicPropertyfie
 	 * @return
 	 */
 	List<BasicPropertyfieldExcel> exportBasicPropertyfield(Wrapper<BasicPropertyfieldEntity> queryWrapper);
-
+	/**
+	 * 存入字段
+	 *
+	 * @return
+	 */
+    Boolean savefiled(BasicPropertyDTO basicProperty);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPropertyvalueService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.vo.BasicPropertyvalueVO;
+import com.logpm.basic.excel.BasicPropertyvalueExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 资产值表 服务类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+public interface IBasicPropertyvalueService extends BaseService<BasicPropertyvalueEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicPropertyvalue
+	 * @return
+	 */
+	IPage<BasicPropertyvalueVO> selectBasicPropertyvaluePage(IPage<BasicPropertyvalueVO> page, BasicPropertyvalueVO basicPropertyvalue);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicPropertyvalueExcel> exportBasicPropertyvalue(Wrapper<BasicPropertyvalueEntity> queryWrapper);
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.service.impl;
 
+import com.logpm.basic.dto.BasicPropertyDTO;
 import com.logpm.basic.entity.BasicPropertyfieldEntity;
 import com.logpm.basic.vo.BasicPropertyfieldVO;
 import com.logpm.basic.excel.BasicPropertyfieldExcel;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 资产字段表 服务实现类
@@ -51,4 +53,17 @@ public class BasicPropertyfieldServiceImpl extends BaseServiceImpl<BasicProperty
 		return basicPropertyfieldList;
 	}
 
+	@Override
+	public Boolean savefiled(BasicPropertyDTO basicProperty) {
+		Long id = basicProperty.getId();
+		AtomicReference<Integer> i = new AtomicReference<>(1);
+		//设置关联主键
+		basicProperty.getField().forEach(e->{
+			e.setMasterId(id);
+			e.setProperty("value"+i);
+			i.getAndSet(i.get() + 1);
+		});
+		return this.saveBatch(basicProperty.getField());
+	}
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyvalueServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.service.impl;
+
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.vo.BasicPropertyvalueVO;
+import com.logpm.basic.excel.BasicPropertyvalueExcel;
+import com.logpm.basic.mapper.BasicPropertyvalueMapper;
+import com.logpm.basic.service.IBasicPropertyvalueService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 资产值表 服务实现类
+ *
+ * @author lmy
+ * @since 2023-06-06
+ */
+@Service
+public class BasicPropertyvalueServiceImpl extends BaseServiceImpl<BasicPropertyvalueMapper, BasicPropertyvalueEntity> implements IBasicPropertyvalueService {
+
+	@Override
+	public IPage<BasicPropertyvalueVO> selectBasicPropertyvaluePage(IPage<BasicPropertyvalueVO> page, BasicPropertyvalueVO basicPropertyvalue) {
+		return page.setRecords(baseMapper.selectBasicPropertyvaluePage(page, basicPropertyvalue));
+	}
+
+
+	@Override
+	public List<BasicPropertyvalueExcel> exportBasicPropertyvalue(Wrapper<BasicPropertyvalueEntity> queryWrapper) {
+		List<BasicPropertyvalueExcel> basicPropertyvalueList = baseMapper.exportBasicPropertyvalue(queryWrapper);
+		//basicPropertyvalueList.forEach(basicPropertyvalue -> {
+		//	basicPropertyvalue.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicPropertyvalue.getType()));
+		//});
+		return basicPropertyvalueList;
+	}
+
+}