diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index 42eba9b..efafbb6 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java @@ -315,4 +315,16 @@ public class TerminalController extends BaseController { } } + @ApiOperation(value = "新增收藏夹接口", notes = "新增收藏夹接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/addFavorList") + @Log(title = "新增收藏夹接口", type = "新增") + public ResponseReult addFavorList( @RequestBody FavorVo vo) { + ServiceBody serviceBody = terminalService.addFavorList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } } + } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java index f7f3123..f3aaa6b 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java @@ -176,4 +176,17 @@ public class TerminalPhotoController extends BaseController { } } + @ApiOperation(value = "删除图片", notes = "删除图片接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/deletePicList") + @Log(title = "删除图片", type = "删除") + public ResponseReult deletePicList(@RequestBody @Validated DeletePicVo vo) { + ServiceBody serviceBody = terminalPhotoService.deletePicList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java index 44d1cad..be16ffd 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java @@ -54,7 +54,7 @@ public class TerminalsWithHeart implements Serializable { private String equipmentType; - + private Integer isfavor; private static final long serialVersionUID = 1L; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java index ca5eb95..3c669e0 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java @@ -1,16 +1,14 @@ package com.shxy.xymanager_common.entity; -import com.shxy.xymanager_common.dto.TermChannelCoordinateDto; import lombok.Data; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import java.util.List; @Data public class TerminalPhoto implements Serializable { - private Long id; + private BigInteger id; private Integer termId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index ce709ce..067b414 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -1,11 +1,11 @@ package com.shxy.xymanager_common.model; -import com.shxy.xymanager_common.dto.TermChannelCoordinateDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigInteger; import java.util.Date; import java.util.List; @@ -29,7 +29,7 @@ public class TerminalPhotoListModel implements Serializable { public static class PhotoBean { @ApiModelProperty(value = "图片id", example = "12321") - private Long id; + private BigInteger id; @ApiModelProperty(value = "装置编号", example = "123456") private Integer termId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java index 0428f40..1cd3f50 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java @@ -31,6 +31,9 @@ public class TerminalPhotoSelectListModel implements Serializable { @Data public static class PhotoBean { + @ApiModelProperty(value = "照片id", example = "123456") + private BigInteger picid; + @ApiModelProperty(value = "装置编号", example = "123456") private Integer termid; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/FavorVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/FavorVo.java new file mode 100644 index 0000000..99c2fd7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/FavorVo.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@ApiModel(value = "收藏对象", description = "收藏对象描述") +public class FavorVo { + + @NotEmpty(message = "不能传入空值") + @ApiModelProperty(value = "收藏对象数组", required = true, example = "A0001") + private List list; + + @ApiModelProperty(value = "是否收藏", example = "0--删除收藏 1--收藏") + private Integer type; + +} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index a3403a4..7141cbb 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -73,4 +73,5 @@ public interface TerminalPhotoDao { PhotoMarkDto selectPhotoWithoutPic(MarkReqVo vo); + int deletePicList(@Param("list") List list); } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index 53690a9..88591c1 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -48,4 +48,6 @@ public interface TerminalsDao { int updateCmd(TerminalIdUpdateVo vo); + int updateFavor(@Param("list") List list ,@Param("status") Integer status); + } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index abcfe65..b058413 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -33,6 +33,7 @@ + @@ -199,6 +200,7 @@ d.has_pan as has_pan, d.phase as phase, d.equipment_type as equipment_type, + d.isfavor as isfavor, e.last_heartbeat as last_heartbeat from ((((dy_level a left join `lines` b on a.id = b.dy_level_id ) left join towers c on b.id = c.line_id ) diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 49f4fe8..2adc569 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -540,4 +540,15 @@ where tpm.term_id = #{termId} and tpm.channel_id = #{channelId} + + + + + delete from terminal_photos + where id in + + #{item} + + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index bed1619..4a46d59 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -59,6 +59,7 @@ public class DyLevelServiceImpl implements DyLevelService { @Override public ServiceBody getdyTreeList(Integer type, Integer lineid) { DyLineTreeListModel model = new DyLineTreeListModel(); + ArrayList favorList = new ArrayList<>(); List list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value(),lineid); boolean empty = CollectionUtil.isEmpty(list); if (empty) { @@ -107,6 +108,8 @@ public class DyLevelServiceImpl implements DyLevelService { bean.setHasPan(terminalsWithHeart.getHasPan()); bean.setPhase(terminalsWithHeart.getPhase()); bean.setEquipmentType(terminalsWithHeart.getEquipmentType()); + Integer isfavor = terminalsWithHeart.getIsfavor(); + bean.setIsfavor(isfavor); BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); if (type == null || type.intValue() == -1) {//查询全部 @@ -134,6 +137,9 @@ public class DyLevelServiceImpl implements DyLevelService { bean.setOnlinestatus(CommonStatus.DELETE.value()); } } + if (isfavor!=null && isfavor.intValue() == CommonStatus.EFFECTIVE.value()) { + favorList.add(bean); + } } lineBean.setList(beanlist); lineBeans.add(lineBean); @@ -144,6 +150,7 @@ public class DyLevelServiceImpl implements DyLevelService { model.setOnlineNum(onlinenum); model.setTotalNum(totalnum); model.setList(dyListBeans); + model.setFavorlist(favorList); } return Asserts.success(model); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index be89067..9729700 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -768,5 +768,19 @@ public class TerminalServiceImpl implements TerminalService { } + @Override + public ServiceBody addFavorList(FavorVo vo) { + Integer type = vo.getType(); + List list = vo.getList(); + if (CollectionUtil.isNotEmpty(list)) { + if (type == null || type.intValue() == 0) { + terminalsDao.updateFavor(list, CommonStatus.DELETE.value()); + } else { + terminalsDao.updateFavor(list, CommonStatus.EFFECTIVE.value()); + } + } + return Asserts.success("修改成功"); + } + } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java index 9a592c6..830482a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java @@ -87,4 +87,10 @@ public interface TerminalPhotoService { */ ServiceBody getHistoryList(String requestIp, TermIdAndChannelIdVo vo); + /** + * 删除 + * @param vo + * @return + */ + ServiceBody deletePicList(DeletePicVo vo); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java index ed9f4f7..89bdb50 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java @@ -148,4 +148,11 @@ public interface TerminalService { * @return */ ServiceBody getTermBasicInfoList(BasicTermVo vo); + + /** + * 新增收藏夹功能 + * @param vo + * @return + */ + ServiceBody addFavorList(FavorVo vo); }