src/main/java/com/whyc/controller/BattgroupBaojigroupController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BaojigroupMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BaojigroupService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattgroupUsrService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BaojigroupMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/BattgroupBaojigroupController.java
@@ -5,10 +5,12 @@ import com.whyc.pojo.db_lithium_ram_db.DevInf; import com.whyc.pojo.db_user.BattgroupBaojigroup; import com.whyc.pojo.db_user.BattgroupUsr; import com.whyc.pojo.db_user.UserInf; import com.whyc.service.BaojigroupService; import com.whyc.service.BattgroupBaojigroupService; import com.whyc.service.BattgroupUsrService; import com.whyc.service.DevInfService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -67,5 +69,11 @@ return usrService.opreateUsrInBaoji(dto); } @ApiOperation(value = "查询登录用户对应的包机组") @GetMapping("getUsrBaoji") public Response getUsrBaoji(){ UserInf uinf= ActionUtil.getUser(); return baojiService.getUsrBaoji(uinf.getUid()); } } src/main/java/com/whyc/mapper/BaojigroupMapper.java
@@ -10,4 +10,6 @@ //查询所有的包机组及包机组下设备信息和管理人 List<Baojigroup> getBaojiInfo(); //查询登录用户对应的包机组 List<Baojigroup> getUsrBaoji(int uid); } src/main/java/com/whyc/pojo/db_lithium_ram_db/DevInf.java
@@ -13,6 +13,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; /** * <p> @@ -59,4 +60,6 @@ @TableField(exist = false) private ActmRealstate actmsTate; @TableField(exist = false) private List<Integer> baojiIdList; } src/main/java/com/whyc/service/BaojigroupService.java
@@ -78,5 +78,9 @@ List<Baojigroup> list=mapper.getBaojiInfo(); return new Response().setII(1,list!=null,list,""); } //查询登录用户对应的包机组 public Response getUsrBaoji(int uid) { List<Baojigroup> list=mapper.getUsrBaoji(uid); return new Response().setII(1,list!=null,list,"查询登录用户对应的包机组"); } } src/main/java/com/whyc/service/BattgroupUsrService.java
@@ -4,6 +4,7 @@ import com.whyc.dto.Response; import com.whyc.mapper.BattgroupBaojigroupMapper; import com.whyc.mapper.BattgroupUsrMapper; import com.whyc.pojo.db_user.Baojigroup; import com.whyc.pojo.db_user.BattgroupUsr; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; src/main/java/com/whyc/service/DevInfService.java
@@ -9,18 +9,18 @@ import com.whyc.dto.Response; import com.whyc.mapper.A200RealstateMapper; import com.whyc.mapper.ActmRealstateMapper; import com.whyc.mapper.BattgroupBaojigroupMapper; import com.whyc.mapper.DevInfMapper; 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.UserInf; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; @Service @@ -34,7 +34,11 @@ @Autowired(required = false) private ActmRealstateMapper actmMapper; @Autowired(required = false) private BattgroupBaojigroupMapper battBjmapper; //添加设备 @Transactional public Response addDev(DevInf devInf) { QueryWrapper wrapper=new QueryWrapper(); //判断设备类型生成devId @@ -42,6 +46,19 @@ devInf.setDevId(devId); devInf.setCreateTime(new Date()); int bl=mapper.insert(devInf); if(bl>0){ if(devInf.getBaojiIdList()!=null){ List<BattgroupBaojigroup> listBj=new ArrayList<>(); for (int baojiId:devInf.getBaojiIdList()) { BattgroupBaojigroup baojigroup=new BattgroupBaojigroup(); baojigroup.setDevId(devId); baojigroup.setBaojiGroupId(baojiId); listBj.add(baojigroup); } //将设备添加进指定的包机组 battBjmapper.insertBatchSomeColumn(listBj); } } return new Response().set(1,bl>0); } //判断设备类型生成devId src/main/resources/mapper/BaojigroupMapper.xml
@@ -47,5 +47,17 @@ <select id="getBaojiInfo" resultMap="baojiList"> select * from db_user.tb_baojigroup order by baoji_group_id asc </select> <select id="getUsrBaoji" resultType="com.whyc.pojo.db_user.Baojigroup"> select * from db_user.tb_baojigroup <where> baoji_group_id in ( SELECT distinct baoji_group_id from db_user.tb_battgroup_usr <where> uid=#{uid} </where> ) </where> order by baoji_group_id asc </select> </mapper>