src/main/java/com/whyc/controller/CircleInfController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/SubInfMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/CircleInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/SubInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/SubInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/CircleInfController.java
@@ -6,6 +6,7 @@ import com.whyc.service.BattInfService; import com.whyc.service.CircleInfService; import com.whyc.service.StationInfService; import com.whyc.service.SubInfService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,6 +27,9 @@ @Autowired private BattInfService binfService; @Autowired private SubInfService subService; @PostMapping("add") @@ -55,9 +59,18 @@ //获取动环的设备id String devId = service.getDeviceId(); circleInf.setDeviceId(devId); //存入自建数量 if(circleInf.getSubList()!=null){ circleInf.setSubCount(circleInf.getSubList().size()); } if (service.add(circleInf)>0){ //添加机房站点到用户对应的包机组 binfService.insertUserBattgroupBaojigroupBattgroupSelect(circleInf.getStationId(),0,userId); //添加子件信息 if(circleInf.getSubList()!=null&&circleInf.getSubList().size()>0){ subService.addSubList(devId,circleInf.getSubList()); } //添加电源站点时,更新ReInit字段为1,通讯程序监控变化重新初始化 /*if(powerInf.getPowerDeviceType()== BattinfGroupFactory.DEVICE_POWER) { boolean flag = powerAppSysService.updateFlag("AppServer_Reinit_PowerData_EN"); src/main/java/com/whyc/mapper/SubInfMapper.java
New file @@ -0,0 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.SubInf; public interface SubInfMapper extends CustomMapper<SubInf>{ } src/main/java/com/whyc/pojo/CircleInf.java
@@ -1,16 +1,19 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; import java.util.List; /** * <p> @@ -59,10 +62,36 @@ private String deviceId; private String deviceName; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date circleProductDate; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date circleInuseDate; @ApiModelProperty(value = "资产类别:1 动环,2设备仪器") private Integer deviceType ; @ApiModelProperty(value = "品牌/厂家") private String deviceProduct ; @ApiModelProperty(value = "型号/规格") private String deviceModel ; @ApiModelProperty(value = "所在位置") private String deviceAddress; @ApiModelProperty(value = "正常") private Integer deviceState ; @ApiModelProperty(value = "子件数量") private Integer subCount; @ApiModelProperty(value = "交、直流配电柜") private String propertyName; @TableField(exist = false) private List<SubInf> subList; } src/main/java/com/whyc/pojo/SubInf.java
New file @@ -0,0 +1,60 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; /** * <p> * * </p> * * @author lxw * @since 2024-11-04 */ @Data @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName(schema = "db_circle",value = "tb_sub_inf") @ApiModel(value="SubInf对象", description="") public class SubInf implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "sub_id", type = IdType.AUTO) private Integer subId; private String deviceId; private String subName; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date subInuseDate; @ApiModelProperty(value = "子件类别") private Integer subType; @ApiModelProperty(value = "所属类别") private Integer subDeviceType; @ApiModelProperty(value = "型号/规格") private String subModel; private String propertyName; } src/main/java/com/whyc/service/SubInfService.java
New file @@ -0,0 +1,20 @@ package com.whyc.service; import com.whyc.mapper.SubInfMapper; import com.whyc.pojo.SubInf; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service public class SubInfService { @Autowired(required = false) private SubInfMapper mapper; //添加子件信息 public void addSubList(String devId,List<SubInf> subList) { subList.stream().forEach(sinf->sinf.setDeviceId(devId)); mapper.insertBatchSomeColumn(subList); } }