代码提交普测计划
This commit is contained in:
hzj
@@ -0,0 +1,22 @@
|
||||
package com.njcn.supervision.api;
|
||||
|
||||
import com.njcn.common.pojo.constant.ServerInfo;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.supervision.api.fallback.GeneralSurveyFeignClientFallbackFactory;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
|
||||
/**
|
||||
* 流程实例 Api 接口
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
@FeignClient(value = ServerInfo.SUPERVISION, path = "/generalSurvey", fallbackFactory = GeneralSurveyFeignClientFallbackFactory.class)
|
||||
public interface GeneralSurveyFeignClient {
|
||||
|
||||
@GetMapping("/updateStatus")
|
||||
HttpResult<Object> updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.njcn.supervision.api.fallback;
|
||||
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.supervision.api.GeneralSurveyFeignClient;
|
||||
import com.njcn.supervision.utils.SupervisionEnumUtil;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author denghuajun
|
||||
* @version 1.0.0
|
||||
* @date 2022/3/16
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class GeneralSurveyFeignClientFallbackFactory implements FallbackFactory<GeneralSurveyFeignClient> {
|
||||
@Override
|
||||
public GeneralSurveyFeignClient create(Throwable throwable) {
|
||||
//判断抛出异常是否为解码器抛出的业务异常
|
||||
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
|
||||
if (throwable.getCause() instanceof BusinessException) {
|
||||
BusinessException businessException = (BusinessException) throwable.getCause();
|
||||
exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult());
|
||||
}
|
||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||
return new GeneralSurveyFeignClient() {
|
||||
@Override
|
||||
public HttpResult<Object> updateStatus(String businessKey, Integer status) {
|
||||
log.error("{}异常，降级处理，异常为：{}", "更新普测计划流程状态", throwable.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
package com.njcn.supervision.pojo.param.survey;
|
||||
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/13 18:35【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SupervisionGeneralSurveyPlanParm {
|
||||
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
@ApiModelProperty(value="单位ID")
|
||||
private String orgNo;
|
||||
|
||||
/**
|
||||
* 普测计划名称
|
||||
*/
|
||||
@ApiModelProperty(value="普测计划名称")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 计划生成时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划生成时间")
|
||||
private LocalDate planCreateTime;
|
||||
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划开始时间")
|
||||
private LocalDate planStartTime;
|
||||
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划结束时间")
|
||||
private LocalDate planEndTime;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
@ApiModelProperty(value="实际完成时间")
|
||||
private LocalDate planComplateTime;
|
||||
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
@ApiModelProperty(value="计划负责人")
|
||||
private String leader;
|
||||
|
||||
@ApiModelProperty(value="选中的电站集合")
|
||||
private List<String> subIds;
|
||||
|
||||
@ApiModelProperty("发起人自选审批人 Map")
|
||||
private Map<String, List<String>> startUserSelectAssignees;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
@ApiModelProperty(value="详情")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 文件是否上传(0:否 1:是)
|
||||
*/
|
||||
@ApiModelProperty(value="文件是否上传(0:否 1:是)")
|
||||
private Integer isFileUpload;
|
||||
|
||||
/**
|
||||
* 上传文件数量
|
||||
*/
|
||||
@ApiModelProperty(value="上传文件数量")
|
||||
private Integer fileCount;
|
||||
|
||||
/**
|
||||
* 文件路径
|
||||
*/
|
||||
@ApiModelProperty(value="文件路径")
|
||||
private String filePath;
|
||||
|
||||
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class SupervisionGeneralSurveyPlanUpdate extends SupervisionGeneralSurveyPlanParm {
|
||||
|
||||
/**
|
||||
* 普测计划编号
|
||||
*/
|
||||
@ApiModelProperty(value="普测计划编号")
|
||||
private String planNo;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询实体
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class GeneralSurveyPlanQueryParam extends BaseParam {
|
||||
|
||||
@ApiModelProperty(value="所属区域")
|
||||
private String orgNo;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package com.njcn.supervision.pojo.po.survey;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/13 18:35【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(description="")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "supervision_general_survey_plan_detail")
|
||||
public class SupervisionGeneralSurveyPlanDetailPO extends BaseEntity {
|
||||
/**
|
||||
* 普测计划编号
|
||||
*/
|
||||
@MppMultiId(value = "plan_no")
|
||||
@ApiModelProperty(value="普测计划编号")
|
||||
private String planNo;
|
||||
|
||||
/**
|
||||
* 变电站ID
|
||||
*/
|
||||
@MppMultiId(value = "sub_id")
|
||||
@ApiModelProperty(value="变电站ID")
|
||||
private String subId;
|
||||
|
||||
/**
|
||||
* 变电站名称
|
||||
*/
|
||||
@TableField(value = "sub_name")
|
||||
@ApiModelProperty(value="变电站名称")
|
||||
private String subName;
|
||||
|
||||
/**
|
||||
* 变电站电压等级
|
||||
*/
|
||||
@TableField(value = "voltage_level")
|
||||
@ApiModelProperty(value="变电站电压等级")
|
||||
private String voltageLevel;
|
||||
|
||||
/**
|
||||
* 容量
|
||||
*/
|
||||
@TableField(value = "capacity")
|
||||
@ApiModelProperty(value="容量")
|
||||
private Long capacity;
|
||||
|
||||
/**
|
||||
* 在线监测点id
|
||||
*/
|
||||
@TableField(value = "measurement_point_id")
|
||||
@ApiModelProperty(value="在线监测点id")
|
||||
private String measurementPointId;
|
||||
|
||||
/**
|
||||
* 是否生成问题(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_problem")
|
||||
@ApiModelProperty(value="是否生成问题(0:否 1:是)")
|
||||
private Integer isProblem;
|
||||
|
||||
/**
|
||||
* 是否实现监测(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_survey")
|
||||
@ApiModelProperty(value="是否实现监测(0:否 1:是)")
|
||||
private Integer isSurvey;
|
||||
/**
|
||||
* 状态：0-删除 1-正常
|
||||
*/
|
||||
@TableField(value = "`State`")
|
||||
private Integer state;
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
package com.njcn.supervision.pojo.po.survey;
|
||||
|
||||
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 com.njcn.db.bo.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/13 18:35【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "supervision_general_survey_plan")
|
||||
public class SupervisionGeneralSurveyPlanPO extends BaseEntity {
|
||||
/**
|
||||
* 普测计划编号
|
||||
*/
|
||||
@TableId(value = "plan_no", type = IdType.ASSIGN_UUID)
|
||||
private String planNo;
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
@TableField(value = "org_no")
|
||||
private String orgNo;
|
||||
|
||||
/**
|
||||
* 普测计划名称
|
||||
*/
|
||||
@TableField(value = "plan_name")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 计划生成时间
|
||||
*/
|
||||
@TableField(value = "plan_create_time")
|
||||
private LocalDate planCreateTime;
|
||||
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
@TableField(value = "plan_start_time")
|
||||
private LocalDate planStartTime;
|
||||
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
@TableField(value = "plan_end_time")
|
||||
private LocalDate planEndTime;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
@TableField(value = "plan_complate_time")
|
||||
private LocalDate planComplateTime;
|
||||
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
@TableField(value = "leader")
|
||||
private String leader;
|
||||
|
||||
/**
|
||||
* 计划状态(1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
@TableField(value = "description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 文件是否上传(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_file_upload")
|
||||
private Integer isFileUpload;
|
||||
|
||||
/**
|
||||
* 上传文件数量
|
||||
*/
|
||||
@TableField(value = "file_count")
|
||||
private Integer fileCount;
|
||||
|
||||
/**
|
||||
* 文件路径
|
||||
*/
|
||||
@TableField(value = "file_path")
|
||||
private String filePath;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@TableField(value = "process_instance_id")
|
||||
private String processInstanceId;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 状态：0-删除 1-正常
|
||||
*/
|
||||
@TableField(value = "`State`")
|
||||
private Integer state;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.njcn.supervision.pojo.vo.survey;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
|
||||
* Date: 2023/3/9 14:00【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
public class DeptSubstationVO {
|
||||
@ApiModelProperty(name = "id",value = "id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(name = "pid",value = "父级id")
|
||||
private String pid;
|
||||
|
||||
@ApiModelProperty(name = "name",value = "名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(name = "code",value = "单位编号")
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty(name = "disabled",value = "是否可以选择，电站不用塞，部门塞disabled: true")
|
||||
private boolean disabled;
|
||||
@ApiModelProperty(name = "flag",value = "前端标志")
|
||||
private boolean flag;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty(name = "children",value = "子级")
|
||||
private List<DeptSubstationVO> children = new ArrayList<> ();
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
package com.njcn.supervision.pojo.vo.survey;
|
||||
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanDetailPO;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/13 18:35【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SupervisionGeneralSurveyPlanVO extends BaseEntity {
|
||||
|
||||
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
@ApiModelProperty(value="单位ID")
|
||||
private String orgNo;
|
||||
|
||||
@ApiModelProperty(value="单位名称")
|
||||
private String orgName;
|
||||
|
||||
/**
|
||||
* 普测计划名称
|
||||
*/
|
||||
@ApiModelProperty(value="普测计划名称")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 计划生成时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划生成时间")
|
||||
private LocalDate planCreateTime;
|
||||
|
||||
/**
|
||||
* 计划开始时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划开始时间")
|
||||
private LocalDate planStartTime;
|
||||
|
||||
/**
|
||||
* 计划结束时间
|
||||
*/
|
||||
@ApiModelProperty(value="计划结束时间")
|
||||
private LocalDate planEndTime;
|
||||
|
||||
/**
|
||||
* 实际完成时间
|
||||
*/
|
||||
@ApiModelProperty(value="实际完成时间")
|
||||
private LocalDate planComplateTime;
|
||||
|
||||
/**
|
||||
* 计划负责人
|
||||
*/
|
||||
@ApiModelProperty(value="计划负责人")
|
||||
private String leader;
|
||||
|
||||
@ApiModelProperty(value="选中的电站集合")
|
||||
private List<String> subIds;
|
||||
|
||||
@ApiModelProperty("发起人自选审批人 Map")
|
||||
private Map<String, List<String>> startUserSelectAssignees;
|
||||
|
||||
|
||||
/**
|
||||
* 计划状态(1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
@ApiModelProperty(value="计划状态(1:审批中；2：审批通过；3：审批不通过；4：已取消")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
@ApiModelProperty(value="详情")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 文件是否上传(0:否 1:是)
|
||||
*/
|
||||
@ApiModelProperty(value="文件是否上传(0:否 1:是)")
|
||||
private Integer isFileUpload;
|
||||
|
||||
/**
|
||||
* 上传文件数量
|
||||
*/
|
||||
@ApiModelProperty(value="上传文件数量")
|
||||
private Integer fileCount;
|
||||
|
||||
/**
|
||||
* 文件路径
|
||||
*/
|
||||
@ApiModelProperty(value="文件路径")
|
||||
private String filePath;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@ApiModelProperty(value="流程实例的编号")
|
||||
private String processInstanceId;
|
||||
|
||||
@ApiModelProperty(value="流程实例的编号")
|
||||
private List<SupervisionGeneralSurveyPlanDetailPO> supervisionGeneralSurveyPlanDetailPOS ;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user