保存部件数据

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentParams.java

+/**
+ * @Time: 2022/7/19 18:45
+ * @Author: 任刚
+ * @File：EquipmentParams.class
+ */
+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("wl_equipment_params")
+@ApiModel(value = "EquipmentDetail对象", description = "")
+public class EquipmentParams extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("status")
+    @ApiModelProperty(value="状态")
+    private int status;
+
+    @TableField("reason")
+    @ApiModelProperty(value = "原因分析")
+    private String reason;
+
+    @TableField("measure")
+    @ApiModelProperty(value = "处置措施")
+    private String measure;
+
+    @TableField("code")
+    @ApiModelProperty(value = "设备编码")
+    private String code;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentPar.java

+/**
+ * @Time: 2022/7/20 17:41
+ * @Author: 任刚
+ * @File：EquipmentPar.class
+ */
+package com.yeejoin.equipmanage.common.vo;
+
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
+import com.yeejoin.equipmanage.common.entity.EquipmentParams;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+
+public class EquipmentPar {
+
+
+    private EquipmentParams equipmentParams;
+
+    private Equipment equipment;
+
+
+    public EquipmentParams getEquipmentParams() {
+        return equipmentParams;
+    }
+
+    public void setEquipmentParams(EquipmentParams equipmentParams) {
+        this.equipmentParams = equipmentParams;
+    }
+
+    public Equipment getEquipment() {
+        return equipment;
+    }
+
+    public void setEquipment(Equipment equipment) {
+        this.equipment = equipment;
+    }
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentController.java

 package com.yeejoin.equipmanage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -15,6 +16,7 @@ import com.yeejoin.equipmanage.common.utils.FileHelper;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.service.AbstractQRCodeFactory;
 import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IQRCodeService;
@@ -24,6 +26,7 @@ import com.yeejoin.equipmanage.service.impl.EquipmentServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
@@ -39,7 +42,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
- *
+ * 
  *
  * @author wujiang
  * @date 2020-07-07
@@ -51,6 +54,10 @@ public class EquipmentController extends AbstractBaseController {
 
 	@Autowired
 	IEquipmentService iEquipmentService;
+
+	@Autowired
+	IEquipmentParamsService iEquipmentParamsService;
+
 	@Autowired
 	private EquipmentMapper equipmentMapper;
 	@Autowired
@@ -75,7 +82,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 新增
-	 *
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@@ -85,9 +92,30 @@ public class EquipmentController extends AbstractBaseController {
 		return iEquipmentService.addEquipmentDef(equipment);
 	}
 
+	@RequestMapping(value = "/saveEqu", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public EquipmentPar saveEqu(@RequestBody EquipmentPar equipmentPar) {
+		Equipment equ = equipmentPar.getEquipment();
+		String sysCode = equ.getCode();
+		EquipmentParams params = equipmentPar.getEquipmentParams();
+
+		if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
+			int code = iEquipmentService.count(new QueryWrapper<Equipment>().eq("code", sysCode.trim()));
+			if (code != 0 ) {
+				equipmentPar.getEquipment().setMarkSpecification("设备编码填写重复，请重新输入！");
+				return equipmentPar;
+			}
+		}
+		iEquipmentService.save(equ);
+		params.setCode(equ.getCode());
+		iEquipmentParamsService.saveOne(params);
+		return equipmentPar;
+	}
+
 	/**
 	 * 根据id删除
-	 *
+	 * 
 	 * @param ids
 	 * @return
 	 */
@@ -115,7 +143,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 修改
-	 *
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
@@ -128,7 +156,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 根据id查询
-	 *
+	 * 
 	 * @param id
 	 * @return
 	 */
@@ -149,7 +177,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 列表分页查询
-	 *
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
@@ -167,7 +195,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 获取装备新能参数列表
-	 *
+	 * 
 	 */
 	@RequestMapping(value = "/queryPerfQuotaListByEquipId", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -184,7 +212,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 编辑指标项
-	 *
+	 * 
 	 */
 	@RequestMapping(value = "/performanceindexTemp", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -333,9 +361,9 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/**
-	 *
+	 * 
 	 * 导入数据接口
-	 *
+	 * 
 	 **/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "excel上传(<font color='blue'>release</font>)", notes = "上传excel同步数据库")
@@ -371,8 +399,8 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/*
-	 *
-	 *
+	 * 
+	 * 
 	 * 装备分类树
 	 **/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -457,7 +485,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 获取子节点
-	 *
+	 * 
 	 * @param list
 	 * @param tmpMap
 	 */
@@ -543,10 +571,10 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/**
-	 *
-	 *
+	 * 
+	 * 
 	 * 获取子节点
-	 *
+	 * 
 	 **/
 	private List<CalculateUnitResponse> getUnitChildren(List<CalculateUnitResponse> list, String id) {
 		List<CalculateUnitResponse> temp = new ArrayList<>();
@@ -566,9 +594,9 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/***
-	 *
+	 * 
 	 * 返回结果封装
-	 *
+	 * 
 	 **/
 	public CalculateUnitResponse createCalculateUnitResponse(Unit instance) {
 
@@ -599,7 +627,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 分类查询
-	 *
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/list/{categoryId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentParamsMapper.java

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.entity.EquipmentParams;
+import org.apache.ibatis.annotations.Mapper;
+
+
+public interface EquipmentParamsMapper extends BaseMapper<EquipmentParams> {
+
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentParamsService.java

+package com.yeejoin.equipmanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.EquipmentParams;
+import org.springframework.stereotype.Service;
+
+
+public interface IEquipmentParamsService extends IService<EquipmentParams> {
+
+    EquipmentParams saveOne(EquipmentParams equipmentParams);
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentParamsServiceImpl.java

+/**
+ * @Time: 2022/7/20 14:18
+ * @Author: 任刚
+ * @File：IEquipmentParamsServiceImpl.class
+ */
+package com.yeejoin.equipmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
+import com.yeejoin.equipmanage.common.entity.EquipmentParams;
+import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentParamsMapper;
+import com.yeejoin.equipmanage.service.IEquipmentDetailService;
+import com.yeejoin.equipmanage.service.IEquipmentParamsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipmentParamsServiceImpl  extends ServiceImpl<EquipmentParamsMapper, EquipmentParams>
+        implements IEquipmentParamsService {
+
+    @Autowired
+    private EquipmentParamsMapper equipmentParamsMapper;
+
+    @Override
+    public EquipmentParams saveOne(EquipmentParams equipmentParams) {
+        equipmentParamsMapper.insert(equipmentParams);
+        return equipmentParams;
+    }
+
+
+}