src/main/java/com/whyc/controller/BattAttentionController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/BattSpareController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BattSpareMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BattSpareRecordMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/BattAttention.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/BattSpare.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/BattSpareRecord.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattAttentionService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattSpareService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BattSpareMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BattSpareRecordMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/BattAttentionController.java
@@ -32,8 +32,15 @@ @ApiOperation(value = "取消关注") public Response delete(@RequestBody BattAttention battAttention){ UserInf userInf = ActionUtil.getUser(); battAttention.setUid(userInf.getUId().intValue()); battAttention.setUId(userInf.getUId().intValue()); return service.deleteByEntity(battAttention); } @GetMapping("/judgeInOrNot") @ApiOperation(value = "关注之前识别是否关注过") public Response judgeInOrNot(int battGroupId,int monNum){ UserInf userInf = ActionUtil.getUser(); return service.judgeInOrNot(battGroupId,monNum,userInf.getUId().intValue()); } } src/main/java/com/whyc/controller/BattSpareController.java
New file @@ -0,0 +1,45 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.BattSpare; import com.whyc.pojo.BattSpareRecord; import com.whyc.service.BattSpareService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @RestController @Api(tags = "数据管理-备件电池信息管理") @RequestMapping("battSpare") public class BattSpareController { @Resource private BattSpareService service; @PostMapping("/searchByCondition") @ApiOperation(value = "查询列表-分页") public Response searchByCondition(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody BattSpare spare){ return service.searchByCondition(pageNum,pageSize,spare); } @PostMapping("/add") @ApiOperation(value = "添加") public Response add(@RequestBody BattSpare spare){ return service.add(spare); } @PostMapping("/spareInOrOut") @ApiOperation(value = "出入库操作") public Response spareInOrOut(@RequestBody BattSpareRecord record){ return service.spareInOrOut(record); } @GetMapping("/getSpareRecord") @ApiOperation(value = "查询出入库记录") public Response getSpareRecord(@RequestParam Integer spareId){ return service.getSpareRecord(spareId); } } src/main/java/com/whyc/mapper/BattSpareMapper.java
New file @@ -0,0 +1,10 @@ package com.whyc.mapper; import com.whyc.pojo.BattSpare; import java.util.List; public interface BattSpareMapper extends CustomMapper<BattSpare> { List<BattSpare> searchByCondition(BattSpare spare); } src/main/java/com/whyc/mapper/BattSpareRecordMapper.java
New file @@ -0,0 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.BattSpareRecord; public interface BattSpareRecordMapper extends CustomMapper<BattSpareRecord> { } src/main/java/com/whyc/pojo/BattAttention.java
@@ -1,5 +1,8 @@ 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 io.swagger.annotations.ApiModel; import lombok.Data; @@ -8,9 +11,14 @@ @ApiModel(value = "battAttention对象",description = "电池关注管理对象") @TableName(schema = "web_site",value = "tb_batt_attention") public class BattAttention { @TableId(type = IdType.AUTO) private Integer num; private Integer BattGroupId; private Integer MonNum; private Integer Uid; @TableField("BattGroupId") private Integer battGroupId; @TableField("MonNum") private Integer monNum; @TableField("Uid") private Integer uId; @TableField(exist = false) private String note; } src/main/java/com/whyc/pojo/BattSpare.java
New file @@ -0,0 +1,29 @@ 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 io.swagger.annotations.ApiModel; import lombok.Data; import java.util.Date; @Data @TableName(schema = "db_battinf" ,value = "tb_battspare") @ApiModel("备件电池信息") public class BattSpare { @TableId(type = IdType.AUTO) private int num ;//'主键', @TableField("battProducer") private String battProducer ;//'电池品牌', @TableField("battModel") private String battModel ;//'电池型号', private Date battspareTime ;//'入库时间', @TableField(exist = false) private Date battspareTime1 ;//'入库时间', @TableField("monCount") private int monCount ;//'单体数量', /**包机组id*/ @TableField("baojiGroup_id") private Integer baojiGroupId; } src/main/java/com/whyc/pojo/BattSpareRecord.java
New file @@ -0,0 +1,32 @@ 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 io.swagger.annotations.ApiModel; import lombok.Data; import java.util.Date; @Data @ApiModel("电池备件记录") @TableName(schema = "db_battinf" ,value = "tb_battspare_record") public class BattSpareRecord { @TableId(type = IdType.AUTO) private Integer id; /**备件id*/ private Integer spareId; /**出入库 数量*/ private Integer operationNum; /**出入库 类型:-1,出库;1,入库;0,初始化库存*/ private Integer operationType; /**出入库 时间*/ private Date operationTime; /**当前库存数量*/ private Integer spareNum; /**事件信息*/ @TableField(exist = false) private String eventInfo; } src/main/java/com/whyc/service/BattAttentionService.java
@@ -79,9 +79,24 @@ QueryWrapper<BattAttention> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("battgroupid",batt.getBattGroupId()); queryWrapper.eq("monnum",batt.getMonNum()); queryWrapper.eq("uid",batt.getUid()); queryWrapper.eq("uid",batt.getUId()); mapper.delete(queryWrapper); return new Response().set(1,true,"删除成功"); } public Response judgeInOrNot(int battGroupId,int monNum,int uId){ QueryWrapper<BattAttention> queryWrapper = new QueryWrapper<>(); queryWrapper.select("num"); queryWrapper.eq("battgroupid",battGroupId); queryWrapper.eq("monNum",monNum); queryWrapper.eq("uid",uId); int count = mapper.selectCount(queryWrapper); if (count>0){ return new Response().set(1,true,"该信息已经被关注"); }else{ return new Response().set(1,false,"该信息未被关注"); } } } src/main/java/com/whyc/service/BattSpareService.java
New file @@ -0,0 +1,87 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.BattSpareMapper; import com.whyc.mapper.BattSpareRecordMapper; import com.whyc.pojo.BattSpare; import com.whyc.pojo.BattSpareRecord; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.CollationElementIterator; import java.util.Date; import java.util.List; @Service public class BattSpareService { @Resource private BattSpareMapper mapper; @Resource private BattSpareRecordMapper recordMapper; public Response searchByCondition(int pageNum, int pageSize, BattSpare spare){ PageHelper.startPage(pageNum,pageSize); List<BattSpare> list = mapper.searchByCondition(spare); PageInfo<BattSpare> pageInfo = new PageInfo<>(list); return new Response().set(1,pageInfo,"查询成功"); } public Response add(BattSpare spare){ int lastId = mapper.insert(spare); if (lastId>0){ BattSpareRecord record = new BattSpareRecord(); record.setOperationType(0); record.setOperationTime(new Date()); record.setOperationNum(spare.getMonCount()); record.setSpareNum(spare.getMonCount()); record.setSpareId(lastId); recordMapper.insert(record); return new Response().set(1,true,"添加成功"); }else { return new Response().set(1,false,"添加失败"); } } public Response spareInOrOut(BattSpareRecord record){ //更新备件库表数量 BattSpare spare = mapper.selectById(record.getSpareId()); spare.setBattspareTime(record.getOperationTime()); int monCount = spare.getMonCount()+(record.getOperationType()*record.getOperationNum()); spare.setMonCount(monCount); if(mapper.updateById(spare)>0){ record.setSpareNum(spare.getMonCount()); recordMapper.updateById(record); } return new Response().set(1,true,"更新成功"); } public Response getSpareRecord(Integer spareId){ QueryWrapper<BattSpareRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("spare_id",spareId); queryWrapper.orderByDesc("operation_time"); List<BattSpareRecord> list = recordMapper.selectList(queryWrapper); for (BattSpareRecord record:list) { int operationType = record.getOperationType(); switch (operationType){ case -1: record.setEventInfo("执行了备件出库操作,出库数量为:"+record.getOperationNum()+",备件库存数为:"+record.getSpareNum()); break; case 1: record.setEventInfo("执行了备件入库操作,入库数量为:"+record.getOperationNum()+",备件库存数为:"+record.getSpareNum()); break; case 0: record.setEventInfo("新创建了电池备件,并执行入库,入库数量为:"+record.getOperationNum()+",备件库存数为:"+record.getSpareNum()); break; } } return new Response().set(1,list,"查询成功"); } } src/main/resources/mapper/BattSpareMapper.xml
New file @@ -0,0 +1,33 @@ <?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.whyc.mapper.BattSpareMapper" > <select id="searchByCondition" resultType="com.whyc.pojo.BattSpare"> select * from db_battinf.tb_battspare <where> <if test="spare.battspareTime!=null and spare.battspareTime!=''"> and battspare_time>=#{spare.battspareTime} </if> <if test="spare.battspareTime1!=null and spare.battspareTime1!=''"> and battspare_time<=#{spare.battspareTime1} </if> <if test="spare.battProducer!=null and spare.battProducer!='' and spare.battProducer!='null'"> and battProducer like CONCAT('%',#{spare.battProducer},'%') </if> <if test="spare.battModel!=null and spare.battModel!='' and spare.battModel!='null'"> and BattModel like CONCAT('%',#{spare.battModel},'%') </if> <if test="spare.monCount==0"> and monCount=0 </if> <if test="spare.monCount!=0"> and monCount!=0 </if> <if test="spare.baojiGroupId!=null and spare.baojiGroupId!=0"> and BattModel = #{spare.baojiGroupId} </if> </where> order by battProducer asc,battspare_time desc </select> </mapper> src/main/resources/mapper/BattSpareRecordMapper.xml
New file @@ -0,0 +1,6 @@ <?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.whyc.mapper.BattSpareRecordMapper" > </mapper>