diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/dto/ImsDutyRecDTO.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/dto/ImsDutyRecDTO.java index 01f78b2..3e24a6d 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/dto/ImsDutyRecDTO.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/dto/ImsDutyRecDTO.java @@ -20,24 +20,21 @@ public class ImsDutyRecDTO extends ImsDutyRecEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "巡检路线数据") - @NotNull - private String routeData; - - @ApiModelProperty(value = "巡检路线ID字段") - @NotNull - private Long routeId; - - @ApiModelProperty(value = "路线名称") - @NotNull - private String routeName; +// @ApiModelProperty(value = "巡检路线数据") +// @NotNull +// private String routeData; +// +// @ApiModelProperty(value = "巡检路线ID字段") +// @NotNull +// private Long routeId; +// +// @ApiModelProperty(value = "路线名称") +// @NotNull +// private String routeName; @ApiModelProperty(value = "交班对象值班信息") private ImsSchedulingVo headDutyMainVo; - /** - * 接班对象值班信息 - */ @ApiModelProperty(value = "接班对象值班信息") private ImsSchedulingVo carryDutyMainVo; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java index b969c40..775271c 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java @@ -42,15 +42,6 @@ public class PlanVO extends BaseEntity implements Serializable { @ApiModelProperty(value = "计划名称,长度必须为1到128") @Size(min=1,max = 128,message ="计划名称长度必须为1到128") private String name; -/* - @ApiModelProperty(value="班次id") - private Long classId; - - *//** - * 值班班次名称 - *//* - @ApiModelProperty(value = "值班班次名称") - private String className;*/ /** * 计划开始时间 diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/reservoir-baseinfo-service-api/src/main/java/org/springblade/reservoirbase/entity/WqLrinfB.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/reservoir-baseinfo-service-api/src/main/java/org/springblade/reservoirbase/entity/WqLrinfB.java index 5fcb102..6eaf50c 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/reservoir-baseinfo-service-api/src/main/java/org/springblade/reservoirbase/entity/WqLrinfB.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/reservoir-baseinfo-service-api/src/main/java/org/springblade/reservoirbase/entity/WqLrinfB.java @@ -8,23 +8,19 @@ import org.springblade.core.mp.base.BaseEntity; import java.math.BigDecimal; /** - *湖库表 + * 划界管理 */ @Data @TableName("wq_lrinf_b") public class WqLrinfB extends BaseEntity { - @ApiModelProperty("湖库代码") - private String lrcd; - @ApiModelProperty("水域类型") - private String watp; - @ApiModelProperty("湖（库）名称") - private String lrnm; - @ApiModelProperty("湖（库）面积") - private BigDecimal lrar; - @ApiModelProperty("水库库容") - private BigDecimal rscp; - @ApiModelProperty("经纬度") - private String coordinateset; + @ApiModelProperty("划界依据") + private String accord; + + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件地址") + private String fileUrl; } diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassController.java index 63075d1..8414bd1 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassController.java @@ -29,7 +29,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/imsDutyClass") -@Api(value = "班次controller", tags = "班次相关操作（班次设置）") +@Api(value = "班次管理", tags = "班次相关操作（班次设置）") public class ImsDutyClassController { private final IImsDutyClassService imsDutyClassService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassTypeController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassTypeController.java index 5904f97..3c28b9e 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassTypeController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyClassTypeController.java @@ -27,7 +27,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/imsDutyClassType") -@Api(value = "班次类型controller", tags = "班次类型相关操作") +@Api(value = "班次类型管理", tags = "班次类型相关操作") public class ImsDutyClassTypeController { private final IImsDutyClassTypeService imsDutyClassTypeService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyGroupController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyGroupController.java index 298ee6b..d97b31f 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyGroupController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyGroupController.java @@ -33,7 +33,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/imsDutyGroup") -@Api(value = "值班小组controller", tags = "值班小组相关操作(班组设置+人员分组)") +@Api(value = "班组设置+人员分组", tags = "值班小组相关操作") public class ImsDutyGroupController { private final IImsDutyGroupService imsDutyGroupService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainController.java index d946ad5..c957621 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainController.java @@ -41,7 +41,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/imsDutyMain") -@Api(value = "值班信息主表相关操作", tags = "值班信息主表相关操作") +@Api(value = "值班信息管理", tags = "值班信息主表相关操作") public class ImsDutyMainController { private final IImsDutyMainService imsDutyMainService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainTemplateController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainTemplateController.java index c688d09..de3af9b 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainTemplateController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyMainTemplateController.java @@ -24,7 +24,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/imsDutyMainTemplate") -@Api(value = "排班模版controller", tags = "排班模版") +@Api(value = "排班模版管理", tags = "排班模版") public class ImsDutyMainTemplateController { private final IImsDutyMainTemplateService iImsDutyMainTemplateService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java index cb8cbcd..f204061 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java @@ -33,7 +33,7 @@ import javax.validation.Valid; @RestController @AllArgsConstructor @RequestMapping("/imsDutyRec") -@Api(value = "值班交接controller", tags = "值班交接相关操作（交接班管理）") +@Api(value = "交接班管理", tags = "值班交接相关操作（交接班管理）") public class ImsDutyRecController { private final IImsDutyRecService imsDutyRecService; diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java index e4a09e7..5d30caf 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java @@ -40,90 +40,95 @@ import java.util.stream.Collectors; @Slf4j @Service public class ImsDutyEmergencyServiceImpl extends ServiceImpl implements IImsDutyEmergencyService { - @Resource - private ImsDutyMainMapper imsDutyMainMapper; - @Autowired - private IUserClient userClient; - @Autowired - private ImsDutyClassServiceImpl imsDutyClassService; - @Override - public R saveEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity) { - ImsDutyMainEntity entity = imsDutyMainMapper.selectOne(new LambdaQueryWrapper() {{ - eq(ImsDutyMainEntity::getStatus, DutyMainStatus.EXEC.getVal()); - eq(ImsDutyMainEntity::getCreateDept, imsDutyEmergencyEntity.getCreateDept()); - like(ImsDutyMainEntity::getDutyPersonIds, AuthUtil.getUserId()).last(" limit 1"); - }}); - if (ObjectUtil.isEmpty(entity)) { - return R.success("您当前未值班"); - } - this.saveOrUpdate(imsDutyEmergencyEntity); - return R.success("保存成功"); - } + @Resource + private ImsDutyMainMapper imsDutyMainMapper; + @Autowired + private IUserClient userClient; + @Autowired + private ImsDutyClassServiceImpl imsDutyClassService; - @Override - public R deleteEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity) { - this.removeById(imsDutyEmergencyEntity.getId()); - return R.success("删除成功"); - } + @Override + public R saveEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity) { + ImsDutyMainEntity entity = imsDutyMainMapper.selectOne(new LambdaQueryWrapper() {{ + eq(ImsDutyMainEntity::getStatus, DutyMainStatus.EXEC.getVal()); +// eq(ImsDutyMainEntity::getCreateDept, imsDutyEmergencyEntity.getCreateDept()); + like(ImsDutyMainEntity::getDutyPersonIds, AuthUtil.getUserId()).last(" limit 1"); + }}); + if (ObjectUtil.isEmpty(entity)) { + return R.fail("您当前未值班"); + } + imsDutyEmergencyEntity.setDutyClass(entity.getClassId()); + imsDutyEmergencyEntity.setDutyClassName(entity.getClassName()); + imsDutyEmergencyEntity.setDutyTime(entity.getDutyDate()); + this.saveOrUpdate(imsDutyEmergencyEntity); + return R.success("保存成功"); + } - @Override - public R queryEntity(ImsDutyEmergencyVo imsDutyEmergencyVo, Query query) { - QueryWrapper queryWrapper = getQueryWrapper(imsDutyEmergencyVo); - IPage imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), queryWrapper); - List records = imsDutyEmergencyEntityIPage.getRecords(); - List collect ; - if (CollectionUtils.isNotEmpty(records)){ - collect= records.stream().map(sig -> { - R user = userClient.userInfoById(sig.getRegistrant()); - if (user.isSuccess()&& ObjectUtils.isNotEmpty(user.getData())){ - sig.setRegistrantName(user.getData().getName()); - } - R userR = userClient.userInfoById(sig.getChargePerson()); - if (userR.isSuccess()&&ObjectUtils.isNotEmpty(userR.getData())){ - sig.setChargePersonName(userR.getData().getName()); - } - ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass()); - sig.setDutyClassName(classEntity.getClassName()); - return sig; - }).collect(Collectors.toList()); - imsDutyEmergencyEntityIPage.setRecords(collect); - } - return R.data(imsDutyEmergencyEntityIPage); - } - private QueryWrapper getQueryWrapper(ImsDutyEmergencyVo imsDutyEmergencyVo) { - QueryWrapper queryWrapper = new QueryWrapper(); - if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getId())) { - queryWrapper.lambda().in(ImsDutyEmergencyEntity::getId, imsDutyEmergencyVo.getId()); - } - if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyStartTime())) { - queryWrapper.lambda().ge(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyStartTime()); - } - if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyEndTime())) { - queryWrapper.lambda().le(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyEndTime()); - } - if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getDutyClass())) { - queryWrapper.lambda().in(ImsDutyEmergencyEntity::getDutyClass, imsDutyEmergencyVo.getDutyClass()); - } - if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getChargePerson())) { - queryWrapper.lambda().in(ImsDutyEmergencyEntity::getChargePerson, imsDutyEmergencyVo.getChargePerson()); - } - if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) { - queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant()); - } - if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) { - queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant()); - } - if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventTitle())) { - queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventTitle, imsDutyEmergencyVo.getEventTitle()); - } - if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventInfo())) { - queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventInfo, imsDutyEmergencyVo.getEventInfo()); - } - if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventType())) { - queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventType, imsDutyEmergencyVo.getEventType()); - } - return queryWrapper; - } + @Override + public R deleteEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity) { + this.removeById(imsDutyEmergencyEntity.getId()); + return R.success("删除成功"); + } + + @Override + public R queryEntity(ImsDutyEmergencyVo imsDutyEmergencyVo, Query query) { + QueryWrapper queryWrapper = getQueryWrapper(imsDutyEmergencyVo); + IPage imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), queryWrapper); + List records = imsDutyEmergencyEntityIPage.getRecords(); + List collect; + if (CollectionUtils.isNotEmpty(records)) { + collect = records.stream().map(sig -> { + R user = userClient.userInfoById(sig.getRegistrant()); + if (user.isSuccess() && ObjectUtils.isNotEmpty(user.getData())) { + sig.setRegistrantName(user.getData().getName()); + } + R userR = userClient.userInfoById(sig.getChargePerson()); + if (userR.isSuccess() && ObjectUtils.isNotEmpty(userR.getData())) { + sig.setChargePersonName(userR.getData().getName()); + } + ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass()); + sig.setDutyClassName(classEntity.getClassName()); + return sig; + }).collect(Collectors.toList()); + imsDutyEmergencyEntityIPage.setRecords(collect); + } + return R.data(imsDutyEmergencyEntityIPage); + } + + private QueryWrapper getQueryWrapper(ImsDutyEmergencyVo imsDutyEmergencyVo) { + QueryWrapper queryWrapper = new QueryWrapper(); + if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getId())) { + queryWrapper.lambda().in(ImsDutyEmergencyEntity::getId, imsDutyEmergencyVo.getId()); + } + if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyStartTime())) { + queryWrapper.lambda().ge(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyStartTime()); + } + if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyEndTime())) { + queryWrapper.lambda().le(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyEndTime()); + } + if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getDutyClass())) { + queryWrapper.lambda().in(ImsDutyEmergencyEntity::getDutyClass, imsDutyEmergencyVo.getDutyClass()); + } + if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getChargePerson())) { + queryWrapper.lambda().in(ImsDutyEmergencyEntity::getChargePerson, imsDutyEmergencyVo.getChargePerson()); + } + if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) { + queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant()); + } + if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) { + queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant()); + } + if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventTitle())) { + queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventTitle, imsDutyEmergencyVo.getEventTitle()); + } + if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventInfo())) { + queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventInfo, imsDutyEmergencyVo.getEventInfo()); + } + if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventType())) { + queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventType, imsDutyEmergencyVo.getEventType()); + } + return queryWrapper; + } } diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java index 41a3e34..077fb1b 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java @@ -13,7 +13,6 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; -import org.springblade.flow.core.feign.IFlowClient; import org.springblade.hzinfo_inspect.duty.constants.OperationalConstants; import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsReqDTO; import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsRspDTO; @@ -170,13 +169,13 @@ public class ImsDutyRecServiceImpl extends ServiceImpl res = ips.selectHandledInspectionProblemViewList(ipv, Condition.getPage(query)); - return R.data(res,"查询成功"); + return R.data(res, "查询成功"); } /** * 获取巡检问题视图列表信息 + * * @param ipv 巡检问题视图实例 * @return 巡检问题视图列表 */ @@ -64,24 +66,26 @@ public class InspectionProblemController extends BladeController { ipv.setAcceptor(AuthUtil.getUserId()); ipv.setCreator(AuthUtil.getUserId()); IPage res = ips.selectInspectionProblemViewList(ipv, Condition.getPage(query)); - return R.data(res,"查询成功"); + return R.data(res, "查询成功"); } /** * 获取巡检问题视图信息 + * * @param ipv 巡检问题视图实例 * @return 巡检问题视图实例 */ - + @RequestMapping("/getInspectionProblemView") @ResponseBody public R getInspectionProblemView(@RequestBody InspectionProblemView ipv) { InspectionProblemView res = ips.selectInspectionProblemView(ipv); - return R.data(res,"查询成功"); + return R.data(res, "查询成功"); } /** * 插入巡检问题信息 + * * @param ip 巡检问题实例 * @return 结果整型数 */ @@ -91,11 +95,12 @@ public class InspectionProblemController extends BladeController { ip.setCreator(AuthUtil.getUserId()); // ip.setAcceptor(InspectionUserUtils.getCurrentUserInfo(request)); InspectionProblem res = ips.insertInspectionProblem(ip); - return R.data(res,"插入成功"); + return R.data(res, "插入成功"); } /** * 更新巡检问题信息 + * * @param ip 巡检问题实例 * @return 结果整型数 */ @@ -104,60 +109,58 @@ public class InspectionProblemController extends BladeController { public R modifyInspectionProblem(@RequestBody InspectionProblem ip) { ip.setAcceptor(AuthUtil.getUserId()); int res = ips.updateInspectionProblem(ip); - return R.data(res,"更新成功"); + return R.data(res, "更新成功"); } /** * 移除已处理巡检问题信息 - * @param ipuh 已处理巡检问题实例 - * @return 结果整型数 */ - @RequestMapping("/removeHandledInspectionProblem") @ResponseBody public R removeHandledInspectionProblem(@RequestBody InspectionProblemUserHandle ipuh) { ipuh.setUserId(AuthUtil.getUserId()); - int res = ipuhs.deleteInspectionProblemUserHandle(ipuh); - return R.data(res,"移除成功"); + int result = ipuhs.deleteInspectionProblemUserHandle(ipuh); + return R.status(result > 0); } /** * 批量插入巡检问题附件信息 + * * @param ids 问题id以及文件id集合 * @return 结果整型数 */ - + @RequestMapping("/addInspectionProblemAttachmentBatch") @ResponseBody public R addInspectionProblemAttachmentBatch(@RequestBody List ids) { int res = ipas.insertInspectionProblemAttachmentBatch(ids.get(0), ids.subList(1, ids.size())); - return R.data(res,"新增成功"); + return R.data(res, "新增成功"); } /** * 批量插入巡检问题处理过程附件信息 + * * @param ids 过程id以及文件id集合 * @return 结果整型数 */ - @RequestMapping("/addInspectionProblemHandleAttachmentBatch") @ResponseBody public R addInspectionProblemHandleAttachmentBatch(@RequestBody List ids) { int res = iphas.insertInspectionProblemHandleAttachmentBatch(ids.get(0), ids.subList(1, ids.size())); - return R.data(res,"新增成功"); + return R.data(res, "新增成功"); } /** * 批量插入巡检问题处理过程附件信息 + * * @param ids 过程id以及文件id集合 * @return 结果整型数 */ - @RequestMapping("/addProblemHandleAttachment") @ResponseBody public R addProblemHandleAttachment(@RequestBody List ids) { int res = iphas.addProblemHandleAttachment(ids.get(0), ids.subList(1, ids.size())); - return R.data(res,"新增成功"); + return R.data(res, "新增成功"); } } diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/controller/WqLrinfBController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/controller/WqLrinfBController.java index d2572fd..2ab6872 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/controller/WqLrinfBController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/controller/WqLrinfBController.java @@ -11,10 +11,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.reservoirbase.entity. WqLrinfB; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.reservoirbase.entity.WqLrinfB; +import org.springblade.reservoirbase.service.ITransferService; import org.springblade.reservoirbase.service.IWqLrinfBService; import org.springblade.reservoirbase.util.ParamUtil; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -23,13 +26,13 @@ import java.util.Map; @RestController @RequestMapping("/reservoirBaseInfo/wqLrinfB") @AllArgsConstructor -@Api(value = "湖库信息", tags = "湖库信息接口") +@Api(value = "划界管理", tags = "划界管理") public class WqLrinfBController extends BladeController implements CacheNames { + private final IWqLrinfBService wqLrinfBService; - /** - * 分页 - */ + private final ITransferService iTransferService; + @GetMapping("/pageList") @ApiImplicitParams({ @ApiImplicitParam(name = "lrcd", value = "湖库代码", paramType = "query", dataType = "string"), @@ -37,16 +40,23 @@ public class WqLrinfBController extends BladeController implements CacheNames { @ApiImplicitParam(name = "lrnm", value = "湖（库）名称", paramType = "query", dataType = "string") }) @ApiOperationSupport(order = 1) - @ApiOperation(value = "分页", notes = "传入wqLrinfB") + @ApiOperation(value = "分页查询", notes = "传入wqLrinfB") public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { - LambdaQueryWrapper wrapper= ParamUtil.conditionWqLrinfB(param); + LambdaQueryWrapper wrapper = ParamUtil.conditionWqLrinfB(param); IPage pages = wqLrinfBService.page(Condition.getPage(query), wrapper); return R.data(pages); } - /** - * 列表 - */ + @PostMapping(value = "/uploadFile") + @ApiOperation(notes = "上传单个文件", value = "上传单个文件") + public R uploadFile(@RequestParam("file") MultipartFile file) { + String path = iTransferService.addFile(file, "huajie"); + if (StringUtil.isNoneBlank(path)) { + return R.data(path); + } else { + return R.fail("上传失败"); + } + } @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), @@ -56,31 +66,24 @@ public class WqLrinfBController extends BladeController implements CacheNames { @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入wqLrinfB") public R> list(@ApiIgnore @RequestParam Map param) { - LambdaQueryWrapper wrapper=ParamUtil.conditionWqLrinfB(param); + LambdaQueryWrapper wrapper = ParamUtil.conditionWqLrinfB(param); List list = wqLrinfBService.list(wrapper); return R.data(list); } - - /** - * 详情 - */ @GetMapping("/detail") @ApiOperationSupport(order = 3) @ApiOperation(value = "详情", notes = "传入wqLrinfB") - public R detail(WqLrinfB wqLrinfB) { - WqLrinfB detail = wqLrinfBService.getOne(Condition.getQueryWrapper(wqLrinfB)); + public R detail(WqLrinfB wqLrinfB) { + WqLrinfB detail = wqLrinfBService.getOne(Condition.getQueryWrapper(wqLrinfB)); return R.data(detail); } - /** - * 新增 - */ @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入wqLrinfB") - public R save(@RequestBody WqLrinfB wqLrinfB) { - LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + public R save(@RequestBody WqLrinfB wqLrinfB) { + /*LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); wrapper.eq(WqLrinfB::getLrcd,wqLrinfB.getLrcd()); List list =wqLrinfBService.list(wrapper); if(list!=null && !list.isEmpty()){ @@ -92,23 +95,17 @@ public class WqLrinfBController extends BladeController implements CacheNames { list =wqLrinfBService.list(wrapper); if(list!=null && !list.isEmpty()){ return R.fail("湖库名称已存在"); - } - return R.status(wqLrinfBService.save( wqLrinfB)); + }*/ + return R.status(wqLrinfBService.save(wqLrinfB)); } - /** - * 修改 - */ @PostMapping("/update") @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入wqLrinfB") - public R update(@RequestBody WqLrinfB wqLrinfB) { - return R.status(wqLrinfBService.updateById( wqLrinfB)); + public R update(@RequestBody WqLrinfB wqLrinfB) { + return R.status(wqLrinfBService.updateById(wqLrinfB)); } - /** - * 删除 - */ @PostMapping("/remove") @ApiOperationSupport(order = 6) @ApiOperation(value = "逻辑删除", notes = "ids") diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/ITransferService.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/ITransferService.java new file mode 100644 index 0000000..0095faa --- /dev/null +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/ITransferService.java @@ -0,0 +1,13 @@ +package org.springblade.reservoirbase.service; + +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +public interface ITransferService { + + String addFile(MultipartFile file,String childPath); + + List addFiles(MultipartFile[] files,String childPath); + +} diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/impl/TransferServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/impl/TransferServiceImpl.java new file mode 100644 index 0000000..9e9cdc9 --- /dev/null +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/impl/TransferServiceImpl.java @@ -0,0 +1,64 @@ +package org.springblade.reservoirbase.service.impl; + +import org.apache.commons.io.FileUtils; +import org.springblade.reservoirbase.service.ITransferService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@Service +public class TransferServiceImpl implements ITransferService { + + @Value("${file.upload.path}") + private String fileUploadPath; + + @Override + public String addFile(MultipartFile file, String childPath) { + MultipartFile[] files = new MultipartFile[1]; + files[0] = file; + return addFiles(files, childPath).get(0); + } + + @Override + public List addFiles(MultipartFile[] files, String childPath) { + List list = new ArrayList<>(); + String dirName = UUID.randomUUID().toString().replace("-", ""); + File uploadPath = new File(fileUploadPath, childPath); + uploadPath = new File(uploadPath, dirName); + try { + if (!uploadPath.exists()) { + uploadPath.mkdirs(); + } + for (MultipartFile file : files) { + saveFile(file, uploadPath); + list.add(File.separator + childPath + File.separator + dirName + File.separator + file.getOriginalFilename()); + } + return list; + } catch (IOException e) { + return list; + } + } + + /** + * 保存文件,如果后期有要求需要处理重名情况 + * + * @param file 待保存的文件 + * @param uploadPath 上传的路径 + * @throws IOException + */ + private void saveFile(MultipartFile file, File uploadPath) throws IOException { + String originalName = file.getOriginalFilename(); + File path = new File(uploadPath, originalName); + if (!path.exists()) { + path.createNewFile(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), path); + } + +} diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/util/ParamUtil.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/util/ParamUtil.java index 7f494fa..6ac99d6 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/util/ParamUtil.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/util/ParamUtil.java @@ -63,7 +63,7 @@ public class ParamUtil { public static LambdaQueryWrapper conditionWqLrinfB(Map param){ LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); - if(param.get("lrcd")!=null) { + /* if(param.get("lrcd")!=null) { wrapper.like(WqLrinfB::getLrcd,param.get("lrcd")); } if(param.get("lrnm")!=null) { @@ -71,7 +71,7 @@ public class ParamUtil { } if(param.get("watp")!=null) { wrapper.eq(WqLrinfB::getWatp,param.get("watp")); - } + }*/ return wrapper; } diff --git a/hnac-framework-boot/src/main/resources/application-local.yml b/hnac-framework-boot/src/main/resources/application-local.yml new file mode 100644 index 0000000..168760f --- /dev/null +++ b/hnac-framework-boot/src/main/resources/application-local.yml @@ -0,0 +1,184 @@ +#数据源配置 +spring: + datasource: + dynamic: + enabled: true + primary: mysql #设置默认的数据源或者数据源组,默认值即为master + strict: true #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源. + datasource: + mysql: + url: jdbc:mysql://192.168.1.58:3576/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: hzinfo + password: 1qaz2WSX! + slave: + url: jdbc:mysql://192.168.1.58:3576/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: root + password: 1qaz2WSX! + tdengine: + db-type: postgresql + driver-class-name: com.taosdata.jdbc.rs.RestfulDriver + url: jdbc:TAOS-RS://192.168.1.202:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8 + username: root + password: taosdata + redis: + host: 192.168.1.58 #本地redis + port: 3577 + password: L_MM&h=+Nm&p)U9sk.uH + database: 0 + ssl: false + timeout: 3000 + + +jedis: + pool: + maxActive: 100 + maxIdle: 50 + maxWait: 1500 + testOnBorrow: true + testOnReturn: true + +blade: + notCkeckTenantId: "200000" + sdk: + signatrue: + enabled: false + analyze-data: + minute-days: 30 + socond-hour: 6 + day-day: 365 + soe-shake: + open: true + second: 60 + data: + sdk: + enabled: true + url: http://127.0.0.1:7502/api/hzinfo-data-config #nignx后台代理端口 + appId: '1529342971768860673' + appSecret: 3b599c56a6c6c2d35dcfb7e63d04414f + backups: true + yc-batch-number: 50 + yx-batch-number: 50 + soe-batch-number: 20 + stations: + - stationId: 999999 + delay: 10 + - stationId: 12345654321 + delay: 10 + - stationId: 999900000002 + delay: 10 + datasource: + socket: + tdengine: + url: ${spring.datasource.dynamic.datasource.tdengine.url} + username: ${spring.datasource.dynamic.datasource.tdengine.username} + password: ${spring.datasource.dynamic.datasource.tdengine.password} + mqtt: + enabled: true + userName: hzinfo + password: hz123456 + urls: tcp://192.168.1.58:1883 + # urls: tcp://192.168.65.86:1883 + clientId: hzinfo_boot_mqtt + topicNames: topic_device_model,topic_hzinfo_props,topic_hzinfo_yx,topic_hzinfo_heart_beat,topic_hzinfo_control_return,topic_hzinfo_events_alarm,topic_hzinfo_events + +file: + upload: + path: D:\\upload + excel: + excelUrl: D:\\upload\\excelResult + excelImage: D:\\upload\\excelResult\\excelImage + + + +hzinfo: + task: + pdf: + # pdf模板路径 ，请配置绝对路径 + # module-path: /data/inspect/pdf/templet/inspectObj.html # linux + module-path: D:\upload\hzinfo\pdf\templet\inspectObj.html # windows + # pdf文件存储路径，请配置绝对路径 + # file-path: /data/inspect/pdf/file # linux + file-path: D:/upload/hzinfo/file # windows + +hzims: + inspect: + task: + templateCode: + #巡检任务开始前发送短信信息阿里云模板 + taskBegin: aliyun-task-begin + #巡检任务结束前发送短信信息阿里云模板 + taskEnd: aliyun-task-end + #巡检消息推送模板 - 极光 + jgPushCode: hzinfo-inspect + duty: + file-path: "D:/upload/duty" + +sms: + aliyun: + templateCode: + warn: SMS_167050010 + connectTimeout: 10000 + readTimeout: 10000 + accessKeyId: LTAIdaVZqHxfh10d + accessKeySecret: HLIrI0mGhGdlvnU1h64ewShSF58VGg + profilePoint: cn-changsha + endPoint: cn-changsha + signName: \u534E\u81EA\u79D1\u6280 + +emergency: + plan: + enable: + suffix: doc,docx,pdf,xls,xlsx,csv,jpg,png,mkv,mp3,mp4,wmv + + +hz3000: + runtime: + setting: D:/HZ3000/runtime/info/factory.fac + network: + windows: D:/hz3000/runtime/info/network.xml + linux: /home/hz3000/info/network.xml + #====linux==== + dll: + path: + linux: /home/hz3000/dlls/sysdlls/ + fiveprevention: + dll: + linux: libfiveprevention.so + read: + dll: + name: + linux: libReadData.so + write: + dll: + name: + linux: libWriteData.so + + +soe: + wait: + interval: 500 + time: 120000 + interval: 30000 + show: + number: 10 +expire: + time: 15 + +dynamic: + file: + path: D:\\nginx-1.18.0\\html\\HZInfo/hz3000data/ + + + +wd: + gisUrl: http://175.6.40.67:8053 + areaCodes: 430225000000 + areaCode: 430225000000 + gisCodes: bigemap.bj8061hz + gisLevel: 2 + stcd: 360301002 + +tencent: + push: + appId: 1580011926 + secretKey: ae7e4b5fd20c3599113b6ebfbf82e7ea