src/main/java/com/whyc/dto/BaojiDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BaojigroupMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BattgroupUsrMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_user/BaojiGroup.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_user/BattGroupUsr.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BaojigroupService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/dto/BaojiDto.java
@@ -1,7 +1,7 @@ package com.whyc.dto; import com.whyc.pojo.db_user.BattgroupBaojigroup; import com.whyc.pojo.db_user.BattgroupUsr; import com.whyc.pojo.db_user.BattGroupBaojiGroup; import com.whyc.pojo.db_user.BattGroupUsr; import lombok.Data; import java.io.Serializable; @@ -9,8 +9,8 @@ @Data public class BaojiDto implements Serializable { private List<BattgroupBaojigroup> adddevList; private List<BattgroupBaojigroup> deldevList; private List<BattgroupUsr> addusrList; private List<BattgroupUsr> delusrList; private List<BattGroupBaojiGroup> adddevList; private List<BattGroupBaojiGroup> deldevList; private List<BattGroupUsr> addusrList; private List<BattGroupUsr> delusrList; } src/main/java/com/whyc/mapper/BaojigroupMapper.java
@@ -1,15 +1,15 @@ package com.whyc.mapper; import com.whyc.pojo.db_user.Baojigroup; import com.whyc.pojo.db_user.BaojiGroup; import java.util.List; public interface BaojigroupMapper extends CustomMapper<Baojigroup>{ public interface BaojigroupMapper extends CustomMapper<BaojiGroup>{ //获取最大的包机组编号 Integer getMaxBaojiGroupId(); //查询所有的包机组及包机组下设备信息和管理人 List<Baojigroup> getBaojiInfo(); List<BaojiGroup> getBaojiInfo(); //查询登录用户对应的包机组 List<Baojigroup> getUsrBaoji(int uid); List<BaojiGroup> getUsrBaoji(int uid); } src/main/java/com/whyc/mapper/BattgroupBaojigroupMapper.java
@@ -1,11 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.db_user.BattgroupBaojigroup; import com.whyc.pojo.db_user.BattGroupBaojiGroup; import java.util.List; public interface BattgroupBaojigroupMapper extends CustomMapper<BattgroupBaojigroup>{ public interface BattgroupBaojigroupMapper extends CustomMapper<BattGroupBaojiGroup>{ //包机组下移除设备 void delDevInBaoji(List<BattgroupBaojigroup> devList); void delDevInBaoji(List<BattGroupBaojiGroup> devList); } src/main/java/com/whyc/mapper/BattgroupUsrMapper.java
@@ -1,9 +1,9 @@ package com.whyc.mapper; import com.whyc.pojo.db_user.BattgroupUsr; import com.whyc.pojo.db_user.BattGroupUsr; import java.util.List; public interface BattgroupUsrMapper extends CustomMapper<BattgroupUsr>{ void delUsrInBaoji(List<BattgroupUsr> usrList); public interface BattgroupUsrMapper extends CustomMapper<BattGroupUsr>{ void delUsrInBaoji(List<BattGroupUsr> usrList); } src/main/java/com/whyc/pojo/db_user/BaojiGroup.java
File was renamed from src/main/java/com/whyc/pojo/db_user/Baojigroup.java @@ -26,7 +26,7 @@ @Accessors(chain = true) @TableName(schema = "db_user",value ="tb_baojigroup") @ApiModel(value="Baojigroup对象", description="") public class Baojigroup implements Serializable { public class BaojiGroup implements Serializable { private static final long serialVersionUID = 1L; src/main/java/com/whyc/pojo/db_user/BattGroupBaojiGroup.java
File was renamed from src/main/java/com/whyc/pojo/db_user/BattgroupBaojigroup.java @@ -23,7 +23,7 @@ @Accessors(chain = true) @TableName(schema = "db_user",value ="tb_battgroup_baojigroup") @ApiModel(value="BattgroupBaojigroup对象", description="") public class BattgroupBaojigroup implements Serializable { public class BattGroupBaojiGroup implements Serializable { private static final long serialVersionUID = 1L; src/main/java/com/whyc/pojo/db_user/BattGroupUsr.java
File was renamed from src/main/java/com/whyc/pojo/db_user/BattgroupUsr.java @@ -15,7 +15,7 @@ @Accessors(chain = true) @TableName(schema = "db_user",value ="tb_battgroup_usr") @ApiModel(value="BattgroupUsr对象", description="") public class BattgroupUsr implements Serializable { public class BattGroupUsr implements Serializable { private static final long serialVersionUID = 1L; src/main/java/com/whyc/service/BaojigroupService.java
@@ -5,7 +5,7 @@ import com.whyc.mapper.BaojigroupMapper; import com.whyc.mapper.BattgroupBaojigroupMapper; import com.whyc.mapper.BattgroupUsrMapper; import com.whyc.pojo.db_user.Baojigroup; import com.whyc.pojo.db_user.BaojiGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,7 +25,7 @@ //包机组下添加设备 public Response addBaoji(String baojiName) { Baojigroup baojigroup=new Baojigroup(); BaojiGroup baojigroup=new BaojiGroup(); //获取最大的包机组编号 Integer baojiGroupId=getMaxBaojiGroupId(); baojigroup.setBaojiGroupId(baojiGroupId); @@ -74,12 +74,12 @@ } //查询所有的包机组及包机组下设备信息和管理人 public Response getBaojiInfo() { List<Baojigroup> list=mapper.getBaojiInfo(); List<BaojiGroup> list=mapper.getBaojiInfo(); return new Response().setII(1,list!=null,list,""); } //查询登录用户对应的包机组 public Response getUsrBaoji(int uid) { List<Baojigroup> list=mapper.getUsrBaoji(uid); List<BaojiGroup> list=mapper.getUsrBaoji(uid); return new Response().setII(1,list!=null,list,"查询登录用户对应的包机组"); } } src/main/java/com/whyc/service/DevInfService.java
@@ -14,7 +14,7 @@ import com.whyc.pojo.db_lithium_ram_db.A200Realstate; import com.whyc.pojo.db_lithium_ram_db.ActmRealstate; import com.whyc.pojo.db_lithium_ram_db.DevInf; import com.whyc.pojo.db_user.BattgroupBaojigroup; import com.whyc.pojo.db_user.BattGroupBaojiGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,9 +47,9 @@ int bl=mapper.insert(devInf); if(bl>0){ if(devInf.getBaojiIdList()!=null){ List<BattgroupBaojigroup> listBj=new ArrayList<>(); List<BattGroupBaojiGroup> listBj=new ArrayList<>(); for (int baojiId:devInf.getBaojiIdList()) { BattgroupBaojigroup baojigroup=new BattgroupBaojigroup(); BattGroupBaojiGroup baojigroup=new BattGroupBaojiGroup(); baojigroup.setDevId(devId); baojigroup.setBaojiGroupId(baojiId); listBj.add(baojigroup);