drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java
@@ -73,17 +73,17 @@ public R save(@Valid @RequestBody FwAlarmFavoriteAddParam fwAlarmFavorite) { FwAlarmFavoriteEntity fwAlarmFavoriteEntity = Objects.requireNonNull(BeanUtil.copy(fwAlarmFavorite, FwAlarmFavoriteEntity.class)); fwAlarmFavoriteEntity.setUserId(AuthUtil.getUserId()); return R.status(fwAlarmFavoriteService.save(fwAlarmFavoriteEntity)); return R.status(fwAlarmFavoriteService.saveFwAlarmFavorite(fwAlarmFavoriteEntity)); } /** * 告警记录关注表 删除 * 告警记录关注表 取消 */ @PostMapping("/remove") @PostMapping("/cancelFavorite") @ApiOperationSupport(order = 7) @ApiOperation(value = "取消关注", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(fwAlarmFavoriteService.deleteLogic(Func.toLongList(ids))); return R.status(fwAlarmFavoriteService.cancelFavorite(Func.toLongList(ids))); }
@@ -48,4 +48,18 @@ * @return */ List<FwAlarmFavoriteExcel> exportFwAlarmFavorite(Wrapper<FwAlarmFavoriteEntity> queryWrapper); /** * * @param longList * @return */ boolean cancelFavorite(List<Long> longList); /** * * @param fwAlarmFavoriteEntity * @return */ boolean saveFwAlarmFavorite(FwAlarmFavoriteEntity fwAlarmFavoriteEntity); } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwAlarmFavoriteServiceImpl.java
@@ -16,19 +16,21 @@ */ package org.sxkj.fw.record.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.sxkj.fw.record.entity.FwAlarmFavoriteEntity; import org.sxkj.fw.record.vo.FwAlarmFavoriteVO; import org.sxkj.fw.record.excel.FwAlarmFavoriteExcel; import org.sxkj.fw.record.mapper.FwAlarmFavoriteMapper; import org.sxkj.fw.record.service.IFwAlarmFavoriteService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.sxkj.fw.record.vo.FwAlarmFavoriteVO; import java.util.List; import java.util.stream.Collectors; /** * 告警记录关注表 服务实现类 @@ -54,4 +56,50 @@ return fwAlarmFavoriteList; } /** * * @param longList * @return */ @Override public boolean cancelFavorite(List<Long> longList) { List<FwAlarmFavoriteEntity> list = list(Wrappers.<FwAlarmFavoriteEntity>lambdaQuery() .in(FwAlarmFavoriteEntity::getAlarmRecordId, longList) .eq(FwAlarmFavoriteEntity::getUserId, AuthUtil.getUserId())); List<Long> collect = list.stream().map(item -> item.getId()).collect(Collectors.toList()); return deleteLogic(collect); } /** * 关注接口 * @param fwAlarmFavoriteEntity 关注实体 * @return boolean 是否操作成功 */ @Transactional(rollbackFor = Exception.class) @Override public boolean saveFwAlarmFavorite(FwAlarmFavoriteEntity fwAlarmFavoriteEntity) { // 查询是否存在记录（包括已删除） FwAlarmFavoriteEntity existingEntity = baseMapper.selectOne(Wrappers.<FwAlarmFavoriteEntity>lambdaQuery() .eq(FwAlarmFavoriteEntity::getAlarmRecordId, fwAlarmFavoriteEntity.getAlarmRecordId()) .eq(FwAlarmFavoriteEntity::getUserId, fwAlarmFavoriteEntity.getUserId()) ); if (existingEntity != null) { // 已关注状态 if (existingEntity.getIsDeleted() == 0) { return true; } // 恢复已删除记录 existingEntity.setIsDeleted(0); existingEntity.setTitle(fwAlarmFavoriteEntity.getTitle()); existingEntity.setRemark(fwAlarmFavoriteEntity.getRemark()); existingEntity.setUpdateUser(AuthUtil.getUserId()); return updateById(existingEntity); } // 新增记录 fwAlarmFavoriteEntity.setIsDeleted(0); fwAlarmFavoriteEntity.setCreateUser(AuthUtil.getUserId()); return save(fwAlarmFavoriteEntity); } } drone-service/drone-gd/docker-compose-prod.yml
@@ -1,10 +1,10 @@ version: '3.1' services: drone_system: drone_gd: # 从 Harbor 私有仓库拉取镜像 image: 172.21.81.239:32002/drone-manage/drone-gd:SNAPSHOT-$BUILD_NUMBER # image: drone-system:latest container_name: drone-system # image: drone-gd:latest container_name: drone-gd # 宿主机端口：容器启动端口 ports: - "8106:8106" drone-service/drone-gd/docker-compose-test.yml
@@ -1,9 +1,9 @@ version: '3.1' services: drone_system: drone_gd: # 从 Harbor 私有仓库拉取镜像 image: 172.21.81.239:32002/drone-manage-test/drone-gd:SNAPSHOT-$BUILD_NUMBER # image: drone-system:latest # image: drone-gd:latest container_name: drone-gd # 宿主机端口：容器启动端口 ports: drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
@@ -52,7 +52,7 @@ /** * 发布中_拒绝接单 */ PUBLISHING_REJECTING("11", "发布中_拒绝接单", "工单发布"), PUBLISHING_REJECTING("11", "发布中_拒绝接单", "拒绝接单"), /** * 响应中_待拆分 @@ -62,27 +62,27 @@ /** * 响应中_申请取消 */ RESPONDING_APPLY_CANCEL("21", "响应中_申请取消", "接单响应"), RESPONDING_APPLY_CANCEL("21", "响应中_申请取消", "申请取消"), /** * 响应中_申请修改 */ RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "接单响应"), RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "申请取消"), /** * 响应中_已取消 */ RESPONDING_CANCELED("23", "响应中_已取消", "接单响应"), RESPONDING_CANCELED("23", "响应中_已取消", "已取消"), /** * 响应中_拒绝取消 */ RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "接单响应"), RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"), /** * 响应中_拒绝修改 */ RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "接单响应"), RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"), /** * 执行中_待全部完成 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -88,10 +88,6 @@ </if> and is_deleted = 0 </where> <if test="isDeleted != null"> and is_deleted = #{isDeleted} </if></select> </select> </mapper> drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderFlowVO.java
@@ -17,6 +17,9 @@ package org.sxkj.gd.workorder.vo; import java.io.Serializable; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity; import lombok.Data; @@ -57,4 +60,9 @@ */ @ApiModelProperty(value = "类型（0工单任务 1巡查任务）") private String type; // 创建时间 @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; } drone-service/drone-system/docker-compose-prod.yml
@@ -1,15 +1,15 @@ version: '3.1' services: drone_system: ja_drone_system: # 从 Harbor 私有仓库拉取镜像 image: 172.21.81.239:32002/drone-manage/drone-system:SNAPSHOT-$BUILD_NUMBER # image: drone-system:latest container_name: drone-system image: 172.21.81.239:32002/drone-manage/ja-drone-system:SNAPSHOT-$BUILD_NUMBER # image: ja-drone-system:latest container_name: ja-drone-system # 宿主机端口：容器启动端口 ports: - "8106:8106" - "8206:8206" volumes: - /app/logs/system:/data/log/system - /app/logs/ja-system:/data/log/system - /software/service/liscense:/software/service/liscense # 设置环境变量 environment: drone-service/drone-system/docker-compose-test.yml
@@ -1,6 +1,6 @@ version: '3.1' services: drone_system: ja_drone_system: # 从 Harbor 私有仓库拉取镜像 image: 172.21.81.239:32002/drone-manage-test/ja-drone-system:SNAPSHOT-$BUILD_NUMBER # image: drone-system:latest
