DY-JMXF/mosty-dyga-cloud
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加返回信息，修复BUG

Browse Source
This commit is contained in:
DEV_ZZ
2025-09-11 22:27:40 +08:00
parent d32e8436a5
commit 0f4b95f355
20 changed files with 247 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/remote/MostyQwzxFeignServiceRemote.java
View File

@ -3,6 +3,7 @@ package com.mosty.base.feign.remote;
import com.alibaba.fastjson.JSON;
import com.mosty.base.feign.service.MostyQwzxFeignService;
import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
import com.mosty.base.model.entity.qwzx.TbQwJl;
import com.mosty.base.model.entity.qwzx.TbQwXfbb;
import com.mosty.common.base.domain.ResponseResult;
import com.mosty.common.base.entity.log.SpringUtils;
@ -63,4 +64,19 @@ public class MostyQwzxFeignServiceRemote {
return responseResult.getData();
}
/**
* 查询勤务警力信息（根据报备ID和巡防警力ID）
* @param id 报备ID
* @param xfllId 巡防警力ID
* @return 勤务警力信息
*/
public static TbQwJl selectQwJlByBbInfo(String id, String xfllId) {
ResponseResult<TbQwJl> responseResult = MostyQwzxFeignServiceRemote.getService().selectQwJlByBbInfo(id, xfllId);
if (responseResult == null || !responseResult.isSuccess()) {
log.error("查询勤务警力信息（根据报备ID和巡防警力ID）异常 responseResult = {}", JSON.toJSONString(responseResult));
throw new BusinessException("查询勤务警力信息（根据报备ID和巡防警力ID）异常");
}
return responseResult.getData();
}
}

12
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyQwzxFeignService.java
View File

@ -3,11 +3,13 @@ package com.mosty.base.feign.service;
import com.mosty.base.model.dto.qwzx.TbQwJlDto;
import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
import com.mosty.base.model.entity.qwzx.TbQwJl;
import com.mosty.base.model.entity.qwzx.TbQwXfbb;
import com.mosty.common.base.domain.ResponseResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
import java.util.List;
import java.util.Map;
@ -62,4 +64,14 @@ public interface MostyQwzxFeignService {
*/
@GetMapping("/mosty-qwzx/tbQwXfbb/getMybbTodayNew")
ResponseResult<TbQwXfbb> getMyXfbbTodayNew(@RequestParam String bblx);
/**
* 查询勤务警力信息（根据报备ID和巡防警力ID）
* @param id 报备ID
* @param xfllId 巡防警力ID
* @return 勤务警力信息
*/
@GetMapping("/mosty-qwzx/tbQwXfbb/selectQwJlByBbInfo")
ResponseResult<TbQwJl> selectQwJlByBbInfo(@RequestParam("id") String id, @RequestParam("xfllId") String xfllId);
}

6
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwUpdateDTO.java
View File

@ -98,6 +98,12 @@ public class TbZdxlFgxlrwUpdateDTO {
@ApiModelProperty(value = "巡防报备ID")
private String xfbbId;
/**
* 巡防报备勤务警力ID
*/
@ApiModelProperty(value = "巡防报备勤务警力ID")
private String xfbbQwJlId;
/**
* 必到点列表
*/

12
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java
View File

@ -123,11 +123,11 @@ public class TbZdxlFgdwBddxlrwJl extends BaseEntity implements Serializable, Clo
private String dkrXm;
/**
* 打卡人身份证号
* 打卡人ID
*/
@ApiModelProperty(value = "打卡人身份证号")
@TableField(value = "dkr_sfzh")
private String dkrSfzh;
@ApiModelProperty(value = "打卡人ID")
@TableField(value = "dkr_id")
private Long dkrId;
/**
* 所属部门id
@ -254,9 +254,9 @@ public class TbZdxlFgdwBddxlrwJl extends BaseEntity implements Serializable, Clo
public static String DKR_XM_FIELD = "dkr_xm";
/**
* 打卡人身份证号字段名
* 打卡人ID字段名
*/
public static String DKR_SFZH_FIELD = "dkr_sfzh";
public static String DKR_ID_FIELD = "dkr_id";
/**
* 所属部门id

12
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgxlrw.java
View File

@ -237,6 +237,13 @@ public class TbZdxlFgxlrw extends BaseEntity implements Serializable, Cloneable
@TableField(value = "xfbb_id")
private String xfbbId;
/**
* 巡防报备勤务警力ID
*/
@ApiModelProperty(value = "巡防报备勤务警力ID")
@TableField(value = "xfbb_qw_jl_id")
private String xfbbQwJlId;
/**
* 主键ID字段名
@ -363,4 +370,9 @@ public class TbZdxlFgxlrw extends BaseEntity implements Serializable, Cloneable
*/
public static String XFBB_ID_FIELD = "xfbb_id";
/**
* 巡防报备勤务警力ID字段名
*/
public static String XFBB_QW_JL_ID_FIELD = "xfbb_qw_jl_id";
}

6
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgdwBddQuery.java
View File

@ -26,6 +26,12 @@ public class TbZdxlFgdwBddQuery extends BasePage {
@ApiModelProperty(value = "方格点位ID")
private Long fgdwId;
/**
* 方格点位名称
*/
@ApiModelProperty(value = "方格点位名称")
private String fgdwMc;
/**
* 必到点名称
*/

8
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java
View File

@ -7,8 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author zhangzhao
* @description 指导巡逻方格点位必到点巡逻任务表返回对象
@ -34,4 +32,10 @@ public class TbZdxlFgdwBddxlrwVO extends TbZdxlFgdwBddxlrw {
@ApiModelProperty(value = "必到点进度")
private Double bddProgress;
/**
* 是否勾选
*/
@ApiModelProperty(value = "是否勾选")
private Boolean selected;
}

13
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwVO.java
View File

@ -1,6 +1,7 @@
package com.mosty.base.model.vo.yjzl;
import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
import com.mosty.base.model.entity.qwzx.TbQwJl;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -78,10 +79,22 @@ public class TbZdxlFgxlrwVO extends TbZdxlFgxlrw {
@ApiModelProperty(value = "必到点总进度")
private Double bddAllProgress;
/**
* 巡逻里程总进度
*/
@ApiModelProperty(value = "巡逻里程总进度")
private Double xllcProgress;
/**
* 巡防报备信息
*/
@ApiModelProperty(value = "巡防报备信息")
private TbQwXfbbVo xfbb;
/**
* 巡防报备勤务警力信息
*/
@ApiModelProperty(value = "巡防报备勤务警力信息")
private TbQwJl xfbbQwJl;
}