重点作业
parent
35ab16db4e
commit
25222400a0
|
|
@ -14,7 +14,7 @@ sdk:
|
|||
name: ${application.cn-name}-后端
|
||||
group-code: public_api
|
||||
strip-prefix: 0
|
||||
uri: http://${application.name}
|
||||
uri: lb://${application.name}
|
||||
path: /${application.gateway}/**
|
||||
- client:
|
||||
system-code: ${application.name}-container
|
||||
|
|
@ -25,7 +25,7 @@ sdk:
|
|||
name: ${application.cn-name}-前端
|
||||
group-code: public_api
|
||||
strip-prefix: 0
|
||||
uri: http://jjb-saas-base
|
||||
uri: lb://jjb-saas-base
|
||||
path: /${application.gateway}/container/**
|
||||
order: -2
|
||||
openapi:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.zcloud.gbscommon.utils.Tools;
|
|||
import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor;
|
||||
import com.zcloud.key.project.domain.gateway.project.KeyProjectGateway;
|
||||
import com.zcloud.key.project.domain.model.project.KeyProjectE;
|
||||
import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO;
|
||||
import com.zcloud.key.project.dto.project.KeyProjectAddCmd;
|
||||
import com.zcloud.key.project.dto.project.KeyProjectCameraAddCmd;
|
||||
import com.zcloud.key.project.persistence.dataobject.project.KeyProjectCameraDO;
|
||||
|
|
@ -32,7 +33,7 @@ public class KeyProjectAddExe {
|
|||
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(KeyProjectAddCmd cmd) {
|
||||
public KeyProjectCO execute(KeyProjectAddCmd cmd) {
|
||||
KeyProjectE keyProjectE = new KeyProjectE();
|
||||
BeanUtils.copyProperties(cmd, keyProjectE);
|
||||
boolean res = false;
|
||||
|
|
@ -54,7 +55,9 @@ public class KeyProjectAddExe {
|
|||
});
|
||||
keyProjectCameraRepository.saveBatch(keyProjectCameraDOList);
|
||||
}
|
||||
return true;
|
||||
KeyProjectCO keyProjectCO = new KeyProjectCO();
|
||||
BeanUtils.copyProperties(keyProjectE, keyProjectCO);
|
||||
return keyProjectCO;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class KeyProjectRemoveExe {
|
|||
if (byId == null) {
|
||||
throw new BizException("数据不存在");
|
||||
}
|
||||
if(!KeyProjectApplyStatusEnum.NOT_STARTED.getCode().equals(byId.getApplyStatus()) || !KeyProjectApplyStatusEnum.TEMPORARY_SAVE.getCode().equals(byId.getApplyStatus())){
|
||||
if(!KeyProjectApplyStatusEnum.NOT_STARTED.getCode().equals(byId.getApplyStatus()) && !KeyProjectApplyStatusEnum.TEMPORARY_SAVE.getCode().equals(byId.getApplyStatus())){
|
||||
throw new BizException("该状态项目不允许删除");
|
||||
}
|
||||
boolean res = keyProjectGateway.deletedKeyProjectById(id);
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public class KeyProjectServiceImpl implements KeyProjectServiceI {
|
|||
@Override
|
||||
public SingleResponse add(KeyProjectAddCmd cmd) {
|
||||
|
||||
keyProjectAddExe.execute(cmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
KeyProjectCO keyProjectCO =keyProjectAddExe.execute(cmd);
|
||||
return SingleResponse.of(keyProjectCO);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
|
|||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
|
||||
/**
|
||||
* web-client
|
||||
|
|
@ -25,6 +27,7 @@ public class CameraListCmd extends PageQuery {
|
|||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
@ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头")
|
||||
@NotNull(message = "摄像头类型不能为空")
|
||||
private Integer cameraType;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ import java.util.List;
|
|||
@AllArgsConstructor
|
||||
public class KeyProjectAddCmd implements Serializable {
|
||||
|
||||
private String keyProjectId;
|
||||
|
||||
@ApiModelProperty(value = "辖区单位企业id", name = "jurisdictionCorpinfoId", required = true)
|
||||
@NotNull(message = "辖区单位企业id不能为空")
|
||||
private Long jurisdictionCorpinfoId;
|
||||
|
|
@ -100,12 +102,10 @@ public class KeyProjectAddCmd implements Serializable {
|
|||
@ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工", name = "applyStatus")
|
||||
private Integer applyStatus;
|
||||
|
||||
@ApiModelProperty(value = "经度", name = "longitude", required = true)
|
||||
@NotEmpty(message = "经度不能为空")
|
||||
@ApiModelProperty(value = "经度", name = "longitude")
|
||||
private String longitude;
|
||||
|
||||
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
|
||||
@NotEmpty(message = "纬度不能为空")
|
||||
@ApiModelProperty(value = "纬度", name = "latitude")
|
||||
private String latitude;
|
||||
|
||||
@ApiModelProperty(value = "重点作业摄像头信息", name = "keyProjectCameraAddCmdList")
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class KeyProjectPageQry extends PageQuery {
|
|||
@ApiModelProperty(value = "相关方单位id")
|
||||
private Long xgfCorpinfoId;
|
||||
@ApiModelProperty(value = "相关方单位名称")
|
||||
private Long xgfCorpinfoName;
|
||||
private String xgfCorpinfoName;
|
||||
@ApiModelProperty(value = "主管部门id")
|
||||
private Long masterDepartmentId;
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ public class KeyProjectPageQry extends PageQuery {
|
|||
private String corpinfName;
|
||||
|
||||
@ApiModelProperty(value = "project_type")
|
||||
private Long projectType;
|
||||
private String projectType;
|
||||
|
||||
//辖区单位企业id
|
||||
@ApiModelProperty(value = "辖区单位企业id")
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@ public class KeyProjectUpdateStatusCmd implements Serializable {
|
|||
@NotNull(message = "主键不能为空")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "经度", name = "longitude", required = true)
|
||||
@ApiModelProperty(value = "经度", name = "longitude")
|
||||
private String longitude;
|
||||
|
||||
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
|
||||
@ApiModelProperty(value = "纬度", name = "latitude")
|
||||
private String latitude;
|
||||
|
||||
@ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工", name = "applyStatus", required = true)
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ public class KeyProjectGatewayImpl implements KeyProjectGateway {
|
|||
KeyProjectDO d = new KeyProjectDO();
|
||||
BeanUtils.copyProperties(keyProjectE, d);
|
||||
keyProjectRepository.save(d);
|
||||
keyProjectE.setId(d.getId());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ import java.util.Map;
|
|||
* @Date 2026-03-16 10:00:38
|
||||
*/
|
||||
@Mapper
|
||||
@DataScopes({
|
||||
@DataScope(method = "listPage", menuPerms = ""),
|
||||
@DataScope(method = "pageConfirm", menuPerms = ""),
|
||||
})
|
||||
//@DataScopes({
|
||||
// @DataScope(method = "listPage", menuPerms = ""),
|
||||
// @DataScope(method = "pageConfirm", menuPerms = ""),
|
||||
//})
|
||||
public interface KeyProjectMapper extends BaseMapper<KeyProjectDO> {
|
||||
|
||||
IPage<KeyProjectDO> listPage(IPage<KeyProjectDO> iPage, Map<String, Object> params, String menuPerms);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
FROM mobile_camera mc
|
||||
WHERE mc.delete_enum = 'FALSE'
|
||||
<if test="params.corpinfoId != null">
|
||||
and mc.corpinfo_id = #{params.corpinfoId}
|
||||
and mc.xgf_id = #{params.corpinfoId}
|
||||
</if>
|
||||
AND NOT EXISTS (SELECT 1
|
||||
FROM key_project_camera kpc
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
|
||||
LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id
|
||||
<where>
|
||||
kp.delete_enum = 'FALSE'
|
||||
<!-- projectName 模糊查询判空 -->
|
||||
<if test="params.projectName != null and params.projectName != ''">
|
||||
AND kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
</if>
|
||||
|
||||
<!-- applyStatus 判空 -->
|
||||
<if test="params.applyStatus != null and params.applyStatus != ''">
|
||||
<if test="params.applyStatus != null ">
|
||||
AND kp.apply_status = #{params.applyStatus}
|
||||
</if>
|
||||
|
||||
|
|
@ -104,6 +105,7 @@
|
|||
left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
|
||||
LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id
|
||||
<where>
|
||||
kp.delete_enum = 'FALSE'
|
||||
<!-- projectName 模糊查询判空 -->
|
||||
<if test="params.projectName != null and params.projectName != ''">
|
||||
AND kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
|
||||
|
|
|
|||
Loading…
Reference in New Issue