Browse Source

平台升级

zhongwei
ty 5 months ago
parent
commit
bb5cb249c7
  1. 10
      hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java
  2. 4
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
  3. 3
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClientFallBack.java
  4. 10
      hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java
  5. 2
      hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java
  6. 2
      hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/config/SmsConfigVO.java
  7. 2
      hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java
  8. 3
      hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java
  9. 4
      hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java
  10. 6
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java
  11. 12
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java
  12. 4
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java
  13. 12
      hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java
  14. 2
      hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IRainfallClient.java
  15. 1
      hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java
  16. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java
  17. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java
  18. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java
  19. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java
  20. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java
  21. 8
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java
  22. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java
  23. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java
  24. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java
  25. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java
  26. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java
  27. 8
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java
  28. 7
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/scheduled/AssetsCreateTask.java
  29. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java
  30. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java
  31. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java
  32. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java
  33. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java
  34. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java
  35. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java
  36. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java
  37. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java
  38. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java
  39. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java
  40. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java
  41. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java
  42. 6
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java
  43. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java
  44. 7
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java
  45. 12
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceivesServiceImpl.java
  46. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRecordServiceImpl.java
  47. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRevertServiceImpl.java
  48. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpTicketRelationServiceImpl.java
  49. 10
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java
  50. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java
  51. 11
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java
  52. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpManagementServiceImpl.java
  53. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpProviderServiceImpl.java
  54. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java
  55. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpTotalServiceImpl.java
  56. 5
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java
  57. 44
      hzims-service/assets/src/main/resources/application-dev.yml
  58. 28
      hzims-service/assets/src/main/resources/application-prod.yml
  59. 28
      hzims-service/assets/src/main/resources/application-test.yml
  60. 24
      hzims-service/assets/src/main/resources/application.yml
  61. 69
      hzims-service/assets/src/main/resources/template/template.yml
  62. 2
      hzims-service/equipment/pom.xml
  63. 18
      hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java
  64. 7
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java
  65. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java
  66. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java
  67. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsDetailServiceImpl.java
  68. 10
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsServiceImpl.java
  69. 7
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamModelServiceImpl.java
  70. 4
      hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamServiceImpl.java
  71. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java
  72. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java
  73. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAttachController.java
  74. 10
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
  75. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelController.java
  76. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelParamController.java
  77. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmOreanizationController.java
  78. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmParamController.java
  79. 6
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java
  80. 12
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java
  81. 10
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java
  82. 1
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/WorkshopInfoClient.java
  83. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java
  84. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java
  85. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java
  86. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java
  87. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java
  88. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java
  89. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java
  90. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java
  91. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java
  92. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java
  93. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java
  94. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java
  95. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java
  96. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java
  97. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java
  98. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IWorkshopInfoService.java
  99. 5
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java
  100. 4
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationServiceImpl.java
  101. Some files were not shown because too many files have changed in this diff Show More

10
hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java

@ -28,13 +28,13 @@ public interface IQuestionClient {
* @return * @return
*/ */
@GetMapping(SUBMIT_STATION_INFO) @GetMapping(SUBMIT_STATION_INFO)
R<Boolean> submitStationInfo(@RequestParam Integer fdpStationType, R<Boolean> submitStationInfo(@RequestParam("fdpStationType") Integer fdpStationType,
@RequestParam String stationCode, @RequestParam("stationCode") String stationCode,
@RequestParam(required = false) String stationDesc); @RequestParam("stationDesc") String stationDesc);
@DeleteMapping(DELETE_STATION_INFO) @DeleteMapping(DELETE_STATION_INFO)
R<Boolean> deleteStationInfo(@RequestParam String stationId); R<Boolean> deleteStationInfo(@RequestParam("stationId") String stationId);
@DeleteMapping(DELETE_STATION_INFO) @DeleteMapping(DELETE_STATION_INFO)
R<Boolean> deleteStationAnswer(@RequestParam String stationId); R<Boolean> deleteStationAnswer(@RequestParam("stationId") String stationId);
} }

4
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java

@ -31,7 +31,7 @@ public interface IAccessTaskClient extends ITaskClient<OperAccessTaskEntity,Oper
* @return * @return
*/ */
@GetMapping(BILLING) @GetMapping(BILLING)
R<String> billing(@RequestParam Long taskId); R<String> billing(@RequestParam("taskId") Long taskId);
/** /**
* 开始检修任务 * 开始检修任务
@ -41,7 +41,7 @@ public interface IAccessTaskClient extends ITaskClient<OperAccessTaskEntity,Oper
*/ */
@GetMapping(START_TASK) @GetMapping(START_TASK)
@Override @Override
R<Boolean> startTask(@RequestParam Long taskId, @RequestParam String startTime); R<Boolean> startTask(@RequestParam("taskId") Long taskId, @RequestParam("startTime") String startTime);
/** /**
* 完成检修任务 * 完成检修任务

3
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClientFallBack.java

@ -1,6 +1,7 @@
package com.hnac.hzims.operational.station.feign; package com.hnac.hzims.operational.station.feign;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.hnac.hzims.common.logs.utils.StringUtils;
import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.entity.StationEntity;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.User;

10
hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java

@ -38,7 +38,7 @@ public interface TaskFeignClient {
@GetMapping(value = "/task/detail") @GetMapping(value = "/task/detail")
@ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid") @ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid")
R<TaskEntity> detail(@RequestParam Long id); R<TaskEntity> detail(@RequestParam("id") Long id);
/** /**
@ -54,7 +54,7 @@ public interface TaskFeignClient {
@GetMapping(value = "/task/event/list") @GetMapping(value = "/task/event/list")
@ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId")
R<BladePage<EventListVO>> eventList(@RequestParam Long taskId, @SpringQueryMap Query query, R<BladePage<EventListVO>> eventList(@RequestParam("taskId") Long taskId, @SpringQueryMap Query query,
@SpringQueryMap BladeUser bladeUser); @SpringQueryMap BladeUser bladeUser);
@ -63,7 +63,7 @@ public interface TaskFeignClient {
*/ */
@GetMapping(value = "/task/getTaskById") @GetMapping(value = "/task/getTaskById")
@ApiOperation(value = "获取任务详情", notes = "传入taskId") @ApiOperation(value = "获取任务详情", notes = "传入taskId")
R<List<TaskObjectVO>> getTaskById(@RequestParam Long id); R<List<TaskObjectVO>> getTaskById(@RequestParam("id") Long id);
/** /**
@ -71,7 +71,7 @@ public interface TaskFeignClient {
*/ */
@GetMapping("task/getTaskListStatistics") @GetMapping("task/getTaskListStatistics")
@ApiOperation(value = "巡检计划统计", notes = "传入计划id") @ApiOperation(value = "巡检计划统计", notes = "传入计划id")
R<List<VoteChartVo>> getTaskListStatistics(@RequestParam String startTime, @RequestParam String endTime, R<List<VoteChartVo>> getTaskListStatistics(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime,
@RequestParam Long deptId); @RequestParam("deptId") Long deptId);
} }

2
hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java

@ -44,7 +44,7 @@ public interface IMessageClient {
R<Boolean> sendMessage(@RequestBody MessagePushRecordDto request); R<Boolean> sendMessage(@RequestBody MessagePushRecordDto request);
@GetMapping(GET_TEMPLATE_BY_ID) @GetMapping(GET_TEMPLATE_BY_ID)
R<MessageTemplateEntity> getMsgTemplateById(@RequestParam Long id); R<MessageTemplateEntity> getMsgTemplateById(@RequestParam("id") Long id);
@PostMapping(value = SEND_WX_MESSAGE,consumes = "application/json; charset=UTF-8") @PostMapping(value = SEND_WX_MESSAGE,consumes = "application/json; charset=UTF-8")
R<Boolean> sendWxMessage(@RequestBody WxMessageDTO request); R<Boolean> sendWxMessage(@RequestBody WxMessageDTO request);

2
hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/config/SmsConfigVO.java

@ -3,7 +3,7 @@ package com.hnac.hzims.message.vo.config;
import com.hnac.hzims.message.entity.config.SmsConfigEntity; import com.hnac.hzims.message.entity.config.SmsConfigEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springblade.resource.entity.Sms;
import java.io.Serializable; import java.io.Serializable;

2
hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java

@ -45,5 +45,5 @@ public interface CheckCompanyFeignClient {
@GetMapping("/detail") @GetMapping("/detail")
@ApiOperationSupport(order = 40) @ApiOperationSupport(order = 40)
@ApiOperation(value = "详情", notes = "传入id") @ApiOperation(value = "详情", notes = "传入id")
R<CheckCompanyVo> detail(@RequestParam Long id); R<CheckCompanyVo> detail(@RequestParam("id") Long id);
} }

3
hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java

@ -12,6 +12,7 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
/** /**
* @Author WL * @Author WL
@ -29,7 +30,7 @@ public interface SafeEquipmentTrialFeignClient {
@GetMapping("/safeEquimentTrial/list") @GetMapping("/safeEquimentTrial/list")
@ApiOperationSupport(order = 50) @ApiOperationSupport(order = 50)
@ApiOperation(value = "分页", notes = "查询条件:createDept,fileName,startTime,endTime") @ApiOperation(value = "分页", notes = "查询条件:createDept,fileName,startTime,endTime")
R<BladePage<SafeEquipmentTrialVO>> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ; R<BladePage<SafeEquipmentTrialVO>> list( @RequestParam("safeEquipmentTrialDTO")SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ;
} }

4
hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java

@ -33,7 +33,7 @@ public interface SafeproductFeignClient {
@GetMapping("/checkMonth/listconferenceScope/{page}/{size}") @GetMapping("/checkMonth/listconferenceScope/{page}/{size}")
@ApiOperationSupport(order = 50) @ApiOperationSupport(order = 50)
@ApiOperation(value = "分页", notes = "查询条件:month,status,createDept") @ApiOperation(value = "分页", notes = "查询条件:month,status,createDept")
R<BladePage<CheckMonthVo>> listconferenceScope(@PathVariable Long page, @PathVariable Long size, R<BladePage<CheckMonthVo>> listconferenceScope(@PathVariable("page") Long page, @PathVariable("size") Long size,
@SpringQueryMap CheckMonthEntity req); @SpringQueryMap CheckMonthEntity req);
@ -43,7 +43,7 @@ public interface SafeproductFeignClient {
@GetMapping("/checkMonth/detail") @GetMapping("/checkMonth/detail")
@ApiOperationSupport(order = 40) @ApiOperationSupport(order = 40)
@ApiOperation(value = "详情", notes = "传入id") @ApiOperation(value = "详情", notes = "传入id")
R<CheckMonthVo> detail(@RequestParam Long id); R<CheckMonthVo> detail(@RequestParam("id") Long id);

6
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java

@ -40,7 +40,7 @@ public interface TicketFeignClient {
*/ */
@GetMapping("/standard/ticket/detail") @GetMapping("/standard/ticket/detail")
@ApiOperation(value = "详情") @ApiOperation(value = "详情")
R<StandardTicketInfoVO> detail(@RequestParam Long id); R<StandardTicketInfoVO> detail(@RequestParam("id") Long id);
/** /**
@ -69,7 +69,7 @@ public interface TicketFeignClient {
* 根据月份和区域查询工作票列表详情 * 根据月份和区域查询工作票列表详情
*/ */
@GetMapping("/workTicketInfo/workTicketListByMonthAndArea/{page}/{size}") @GetMapping("/workTicketInfo/workTicketListByMonthAndArea/{page}/{size}")
R<BladePage<StandardWorkVo>> workTicketListByMonthAndArea(@PathVariable Long page, R<BladePage<StandardWorkVo>> workTicketListByMonthAndArea(@PathVariable("page") Long page,
@PathVariable Long size, @PathVariable("size") Long size,
@SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo); @SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo);
} }

12
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java

@ -45,7 +45,7 @@ public interface ITicketInfoClient {
* @return * @return
*/ */
@GetMapping(UPDATE_UNDONE_STATUS) @GetMapping(UPDATE_UNDONE_STATUS)
R<Boolean> updateUndoneStatus(@RequestParam Long ticketId); R<Boolean> updateUndoneStatus(@RequestParam("ticketId") Long ticketId);
/** /**
* 根据时间段获取工作票 * 根据时间段获取工作票
@ -54,7 +54,7 @@ public interface ITicketInfoClient {
* @return * @return
*/ */
@GetMapping(GET_WORK_TICKET_BY_TIME) @GetMapping(GET_WORK_TICKET_BY_TIME)
R<List<WorkTicketInfoEntity>> getWorkTicketByTime(@RequestParam String startDate, @RequestParam String endDate); R<List<WorkTicketInfoEntity>> getWorkTicketByTime(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate);
/** /**
* 根据时间段获取操作票 * 根据时间段获取操作票
@ -63,10 +63,10 @@ public interface ITicketInfoClient {
* @return * @return
*/ */
@GetMapping(GET_OPERATE_TICKET_BY_TIME) @GetMapping(GET_OPERATE_TICKET_BY_TIME)
R<List<StandardTicketInfoEntity>> getOperateTicketByTime(@RequestParam String startDate, @RequestParam String endDate); R<List<StandardTicketInfoEntity>> getOperateTicketByTime(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate);
@GetMapping(GET_OPERATE_TICKET_INFO_BY_IDS) @GetMapping(GET_OPERATE_TICKET_INFO_BY_IDS)
R<List<WorkTicketInfoEntity>> getWorkTicketInfoById(@RequestParam List<Long> ticekeIds); R<List<WorkTicketInfoEntity>> getWorkTicketInfoById(@RequestParam("ticekeIds") List<Long> ticekeIds);
/** /**
* 获取操作票的合格率 * 获取操作票的合格率
@ -74,7 +74,7 @@ public interface ITicketInfoClient {
* @return * @return
*/ */
@GetMapping(GET_TICKET_PASS_BY_IDS) @GetMapping(GET_TICKET_PASS_BY_IDS)
R<Long> getTicketPassByIds(@RequestParam List<Long> ticekeIds); R<Long> getTicketPassByIds(@RequestParam("ticekeIds") List<Long> ticekeIds);
/*** /***
* 根据时间段获取工作票变更负责人列表 * 根据时间段获取工作票变更负责人列表
* @param startDate * @param startDate
@ -82,7 +82,7 @@ public interface ITicketInfoClient {
* @return * @return
*/ */
@GetMapping(GET_WORK_TICKET_TRANSFER) @GetMapping(GET_WORK_TICKET_TRANSFER)
R<List<WorkTicketPrincipalChangeEntity>> getWorkTicketTransfer(@RequestParam String startDate, @RequestParam String endDate); R<List<WorkTicketPrincipalChangeEntity>> getWorkTicketTransfer(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate);
/** /**
* 获取首页工作票统计结果 * 获取首页工作票统计结果

4
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java

@ -41,7 +41,7 @@ public interface IWorkTicketTemplateClient {
* @return * @return
*/ */
@GetMapping(GENERATE_TICKET_BY_TEMPLATE_ID) @GetMapping(GENERATE_TICKET_BY_TEMPLATE_ID)
R<List<WorkTicketInfoEntity>> generateTicketByTemplateId(@RequestParam Long templateId, @RequestParam String taskIds R<List<WorkTicketInfoEntity>> generateTicketByTemplateId(@RequestParam("templateId") Long templateId, @RequestParam("taskIds") String taskIds
,@RequestParam String emCode,@RequestParam String emName,@RequestParam String taskName); ,@RequestParam("emCode") String emCode,@RequestParam("emName") String emName,@RequestParam("taskName") String taskName);
} }

12
hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java

@ -39,7 +39,7 @@ public interface IHeWeatherWeatherClient {
* @return * @return
*/ */
@GetMapping(GET_WEATHER_NOW_WITH_CACHE) @GetMapping(GET_WEATHER_NOW_WITH_CACHE)
R<HeWeatherWeatherNowResponse> getWeatherNowWithCache(@RequestParam String location); R<HeWeatherWeatherNowResponse> getWeatherNowWithCache(@RequestParam("location") String location);
/** /**
* 根据location查询三日内天气 * 根据location查询三日内天气
@ -47,7 +47,7 @@ public interface IHeWeatherWeatherClient {
* @return * @return
*/ */
@GetMapping(GET_WEATHER_THREE_DAYS_WITH_CACHE) @GetMapping(GET_WEATHER_THREE_DAYS_WITH_CACHE)
R<HeWeatherWeatherDailyResponse> getWeather3dWithCache(@RequestParam String location); R<HeWeatherWeatherDailyResponse> getWeather3dWithCache(@RequestParam("location") String location);
/** /**
* 根据location查询七日天气 * 根据location查询七日天气
@ -55,7 +55,7 @@ public interface IHeWeatherWeatherClient {
* @return * @return
*/ */
@GetMapping(GET_WEATHER_SEVEN_DAYS_WITH_CACHE) @GetMapping(GET_WEATHER_SEVEN_DAYS_WITH_CACHE)
R<HeWeatherWeatherDailyResponse> getWeather7dWithCache(@RequestParam String location); R<HeWeatherWeatherDailyResponse> getWeather7dWithCache(@RequestParam("location") String location);
/** /**
* 根据站点编码获取近七日的天气情况 * 根据站点编码获取近七日的天气情况
@ -63,7 +63,7 @@ public interface IHeWeatherWeatherClient {
* @return 各站点七日内的天气情况 * @return 各站点七日内的天气情况
*/ */
@GetMapping(GET_WEATHER_SEVEN_DAYS_BY_STATION_CODES) @GetMapping(GET_WEATHER_SEVEN_DAYS_BY_STATION_CODES)
R<Map<String, HeWeatherWeatherDailyResponse>> getWeather7dByStationCodes(@RequestParam String stationCodes); R<Map<String, HeWeatherWeatherDailyResponse>> getWeather7dByStationCodes(@RequestParam("stationCodes") String stationCodes);
/** /**
* 根据站点编码获取实时的天气情况 * 根据站点编码获取实时的天气情况
@ -71,7 +71,7 @@ public interface IHeWeatherWeatherClient {
* @return 各站点实时的天气情况 * @return 各站点实时的天气情况
*/ */
@GetMapping(GET_WEATHER_NOW_BY_STATION_CODES) @GetMapping(GET_WEATHER_NOW_BY_STATION_CODES)
R<Map<String, HeWeatherWeatherNowResponse>> getWeatherNowByStationCodes(@RequestParam String stationCodes); R<Map<String, HeWeatherWeatherNowResponse>> getWeatherNowByStationCodes(@RequestParam("stationCodes") String stationCodes);
/** /**
* 统计某年份的站点区域集团下的降雨量 * 统计某年份的站点区域集团下的降雨量
@ -92,5 +92,5 @@ public interface IHeWeatherWeatherClient {
* @return * @return
*/ */
@GetMapping(GET_WEATHER_NOW_STATION_CODE) @GetMapping(GET_WEATHER_NOW_STATION_CODE)
R<Map<String, List<DailyHeWeatherEntity>>> getWeathersByStationCode(@RequestParam int days, @RequestParam String stationCode); R<Map<String, List<DailyHeWeatherEntity>>> getWeathersByStationCode(@RequestParam("days") int days, @RequestParam("stationCode") String stationCode);
} }

2
hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IRainfallClient.java

@ -16,6 +16,6 @@ public interface IRainfallClient {
String GET_DURATION_RAIN_FALL = API_PREFIX + "/getDurationRainFall"; String GET_DURATION_RAIN_FALL = API_PREFIX + "/getDurationRainFall";
@GetMapping(GET_DURATION_RAIN_FALL) @GetMapping(GET_DURATION_RAIN_FALL)
R<List<Map<String, Object>>> getDurationRainFall(@RequestParam String stationCode, @RequestParam String startDate, @RequestParam String endDate); R<List<Map<String, Object>>> getDurationRainFall(@RequestParam("stationCode") String stationCode, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate);
} }

1
hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java

@ -31,7 +31,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) @SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"}) @MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"})
@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
@MapperScan("com.hnac.hzims.**.mapper.**")
@EnableScheduling @EnableScheduling
@ComponentScan(basePackages = {"com.hnac.hzims.*"}) @ComponentScan(basePackages = {"com.hnac.hzims.*"})
public class AssetsApplication { public class AssetsApplication {

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java

@ -17,7 +17,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -70,7 +70,7 @@ public class SpAllocationController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_allocation") @ApiOperation(value = "分页", notes = "传入sp_allocation")
@ -125,7 +125,7 @@ public class SpAllocationController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "调拨单逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "调拨单逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_allocationService.deleteLogic(Func.toLongList(ids))); return R.status(sp_allocationService.removeBatchByIds(Func.toLongList(ids)));
} }
/** /**

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java

@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -55,7 +55,7 @@ public class SpReceiveController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_receive") @ApiOperation(value = "分页", notes = "传入sp_receive")
@ -109,7 +109,7 @@ public class SpReceiveController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "领用单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "领用单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_receiveService.deleteLogic(Func.toLongList(ids))); return R.status(sp_receiveService.removeByIds(Func.toLongList(ids)));
} }
/** /**
* 完成流程 修改状态 * 完成流程 修改状态

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java

@ -19,7 +19,7 @@ import javax.validation.Valid;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -58,7 +58,7 @@ public class SpReceivesController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
// @ApiLog //
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_receives") @ApiOperation(value = "分页", notes = "传入sp_receives")
@ -112,7 +112,7 @@ public class SpReceivesController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "资产管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "资产管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_receivesService.deleteLogic(Func.toLongList(ids))); return R.status(sp_receivesService.removeBatchByIds(Func.toLongList(ids)));
} }
/** /**
* 完成流程 修改状态 * 完成流程 修改状态

2
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java

@ -104,7 +104,7 @@ public class SpRevertController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "归还删除",type = BusinessType.DELETE,ignore = false) @Operate(label = "归还删除",type = BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_revertService.deleteLogic(Func.toLongList(ids))); return R.status(sp_revertService.removeByIds(Func.toLongList(ids)));
} }
} }

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java

@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -68,7 +68,7 @@ public class SpWarehouseInController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_warehouse_in") @ApiOperation(value = "分页", notes = "传入sp_warehouse_in")
@ -123,7 +123,7 @@ public class SpWarehouseInController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "入库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "入库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_warehouse_inService.deleteLogic(Func.toLongList(ids))); return R.status(sp_warehouse_inService.removeBatchByIds(Func.toLongList(ids)));
} }
/** /**

8
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java

@ -18,7 +18,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
@ -67,7 +67,7 @@ public class SpWarehouseOutController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_warehouse_out") @ApiOperation(value = "分页", notes = "传入sp_warehouse_out")
@ -83,7 +83,7 @@ public class SpWarehouseOutController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/exportList") @GetMapping("/exportList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入sp_warehouse_out") @ApiOperation(value = "分页", notes = "传入sp_warehouse_out")
@ -173,7 +173,7 @@ public class SpWarehouseOutController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "出库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "出库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(sp_warehouse_outService.deleteLogic(Func.toLongList(ids))); return R.status(sp_warehouse_outService.removeBatchByIds(Func.toLongList(ids)));
} }
/** /**

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java

@ -18,7 +18,7 @@ import com.hnac.hzinfo.log.annotation.Operate;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
@ -104,7 +104,7 @@ public class WtSpBasicController extends BladeController {
/** /**
* 基础信息分页列表 * 基础信息分页列表
*/ */
@ApiLog
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入SP_BASIC") @ApiOperation(value = "分页", notes = "传入SP_BASIC")
@ -184,7 +184,7 @@ public class WtSpBasicController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "备品备件基础信息逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "备品备件基础信息逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_BASICService.deleteLogic(Func.toLongList(ids))); return R.status(SP_BASICService.removeByIds(Func.toLongList(ids)));
} }
/** /**

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java

@ -16,7 +16,7 @@ import com.hnac.hzinfo.log.annotation.Operate;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -80,7 +80,7 @@ public class WtSpManagementController extends BladeController {
* @param managent * @param managent
* @return * @return
*/ */
@ApiLog
@GetMapping("/lazy-list") @GetMapping("/lazy-list")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "备品备件分类编码", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "code", value = "备品备件分类编码", paramType = "query", dataType = "string"),
@ -176,7 +176,7 @@ public class WtSpManagementController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "备品备件分类删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "备品备件分类删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_MANAGEMENTService.deleteLogic(Func.toLongList(ids))); return R.status(SP_MANAGEMENTService.removeByIds(Func.toLongList(ids)));
} }
/** /**

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java

@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -61,7 +61,7 @@ public class WtSpProviderController extends BladeController {
* 获取供应商列表 * 获取供应商列表
* @return * @return
*/ */
@ApiLog
@GetMapping("/getProviderList") @GetMapping("/getProviderList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "获取供应商列表") @ApiOperation(value = "获取供应商列表")
@ -136,7 +136,7 @@ public class WtSpProviderController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "供应商删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "供应商删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_PROVIDERService.deleteLogic(Func.toLongList(ids))); return R.status(SP_PROVIDERService.removeByIds(Func.toLongList(ids)));
} }
} }

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java

@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -69,7 +69,7 @@ public class WtSpToolBasicController extends BladeController {
/** /**
* 工具台账分页列表 * 工具台账分页列表
*/ */
@ApiLog
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入toolBasicEntity") @ApiOperation(value = "分页", notes = "传入toolBasicEntity")
@ -124,7 +124,7 @@ public class WtSpToolBasicController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "台账删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "台账删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_TOOL_BASICService.deleteLogic(Func.toLongList(ids))); return R.status(SP_TOOL_BASICService.removeByIds(Func.toLongList(ids)));
} }
} }

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java

@ -17,7 +17,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -71,7 +71,7 @@ public class WtSpTotalController extends BladeController {
/** /**
* 库存分页列表 * 库存分页列表
*/ */
@ApiLog
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入spToolVO") @ApiOperation(value = "分页", notes = "传入spToolVO")
@ -140,7 +140,7 @@ public class WtSpTotalController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "备品备件库存删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "备品备件库存删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_TOTALService.deleteLogic(Func.toLongList(ids))); return R.status(SP_TOTALService.removeByIds(Func.toLongList(ids)));
} }
} }

8
hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java

@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
@ -59,7 +59,7 @@ public class WtSpWarehouseController extends BladeController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE") @ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
@ -75,7 +75,7 @@ public class WtSpWarehouseController extends BladeController {
* @param * @param
* @return * @return
*/ */
@ApiLog
@GetMapping("/selectOptionList") @GetMapping("/selectOptionList")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "仓库列表(下拉框)") @ApiOperation(value = "仓库列表(下拉框)")
@ -143,7 +143,7 @@ public class WtSpWarehouseController extends BladeController {
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
@Operate(label = "仓库管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) @Operate(label = "仓库管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(SP_WAREHOUSEService.deleteLogic(Func.toLongList(ids))); return R.status(SP_WAREHOUSEService.removeByIds(Func.toLongList(ids)));
} }
} }

7
hzims-service/assets/src/main/java/com/hnac/hzims/spare/scheduled/AssetsCreateTask.java

@ -2,19 +2,14 @@ package com.hnac.hzims.spare.scheduled;
import com.hnac.hzims.spare.service.IStockAlertService; import com.hnac.hzims.spare.service.IStockAlertService;
import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Date; import java.util.Date;
import static com.hnac.hzims.spare.constants.ScheduledConstant.*;
@Slf4j @Slf4j
@ -23,8 +18,6 @@ import static com.hnac.hzims.spare.constants.ScheduledConstant.*;
public class AssetsCreateTask { public class AssetsCreateTask {
private final IStockAlertService stockAlertService; private final IStockAlertService stockAlertService;
private final BladeLogger logger;
/** /**
* 库存-告警 * 库存-告警
* @return ReturnT<String> * @return ReturnT<String>

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java

@ -1,9 +1,9 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpAllocationEntity; import com.hnac.hzims.spare.entity.SpAllocationEntity;
import com.hnac.hzims.spare.vo.SpAllocationVO; import com.hnac.hzims.spare.vo.SpAllocationVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
/** /**
@ -11,7 +11,7 @@ import org.springblade.core.mp.support.Query;
* *
* @author Chill * @author Chill
*/ */
public interface ISpAllocationService extends BaseService<SpAllocationEntity> { public interface ISpAllocationService extends IService<SpAllocationEntity> {
/** /**
* 分页列表 * 分页列表
* @param allocationEntity * @param allocationEntity

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java

@ -1,9 +1,10 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpReceiveEntity; import com.hnac.hzims.spare.entity.SpReceiveEntity;
import com.hnac.hzims.spare.vo.SpReceiveVO; import com.hnac.hzims.spare.vo.SpReceiveVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
/** /**
@ -11,7 +12,7 @@ import org.springblade.core.mp.support.Query;
* *
* @author Chill * @author Chill
*/ */
public interface ISpReceiveService extends BaseService<SpReceiveEntity> { public interface ISpReceiveService extends IService<SpReceiveEntity> {
/** /**
* 分页列表 * 分页列表
* @param receiveEntity * @param receiveEntity

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java

@ -1,16 +1,17 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpReceivesEntity; import com.hnac.hzims.spare.entity.SpReceivesEntity;
import com.hnac.hzims.spare.vo.SpReceivesVO; import com.hnac.hzims.spare.vo.SpReceivesVO;
import org.springblade.core.mp.base.BaseService;
/** /**
* 服务类 * 服务类
* *
* @author Chill * @author Chill
*/ */
public interface ISpReceivesService extends BaseService<SpReceivesEntity> { public interface ISpReceivesService extends IService<SpReceivesEntity> {
boolean updateStatu(SpReceivesEntity receiveEntity); boolean updateStatu(SpReceivesEntity receiveEntity);

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java

@ -1,14 +1,15 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpRecordEntity; import com.hnac.hzims.spare.entity.SpRecordEntity;
import org.springblade.core.mp.base.BaseService;
/** /**
* 服务类 * 服务类
* *
* @author Chill * @author Chill
*/ */
public interface ISpRecordService extends BaseService<SpRecordEntity> { public interface ISpRecordService extends IService<SpRecordEntity> {
} }

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java

@ -1,14 +1,15 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpRevertEntity; import com.hnac.hzims.spare.entity.SpRevertEntity;
import org.springblade.core.mp.base.BaseService;
/** /**
* 服务类 * 服务类
* *
* @author Chill * @author Chill
*/ */
public interface ISpRevertService extends BaseService<SpRevertEntity> { public interface ISpRevertService extends IService<SpRevertEntity> {
} }

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java

@ -1,8 +1,9 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpTicketRelationEntity; import com.hnac.hzims.spare.entity.SpTicketRelationEntity;
import org.springblade.core.mp.base.BaseService;
import java.util.List; import java.util.List;
@ -11,6 +12,6 @@ import java.util.List;
* *
* @author Chill * @author Chill
*/ */
public interface ISpTicketRelationService extends BaseService<SpTicketRelationEntity> { public interface ISpTicketRelationService extends IService<SpTicketRelationEntity> {
void deleteSpTicketRelation(List<String> list); void deleteSpTicketRelation(List<String> list);
} }

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java

@ -1,9 +1,10 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpWarehouseInEntity; import com.hnac.hzims.spare.entity.SpWarehouseInEntity;
import com.hnac.hzims.spare.vo.SpWarehouseInVO; import com.hnac.hzims.spare.vo.SpWarehouseInVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
/** /**
@ -11,7 +12,7 @@ import org.springblade.core.mp.support.Query;
* *
* @author Chill * @author Chill
*/ */
public interface ISpWarehouseInService extends BaseService<SpWarehouseInEntity> { public interface ISpWarehouseInService extends IService<SpWarehouseInEntity> {
/** /**
* 分页列表 * 分页列表
* @param warehouseInVO * @param warehouseInVO

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java

@ -1,9 +1,10 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpWarehouseOutEntity; import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
import com.hnac.hzims.spare.vo.SpWarehouseOutVO; import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import java.util.List; import java.util.List;
@ -13,7 +14,7 @@ import java.util.List;
* *
* @author Chill * @author Chill
*/ */
public interface ISpWarehouseOutService extends BaseService<SpWarehouseOutEntity> { public interface ISpWarehouseOutService extends IService<SpWarehouseOutEntity> {
/** /**
* 分页列表 * 分页列表
* @param warehouseOutEntity * @param warehouseOutEntity

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java

@ -1,12 +1,13 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity; import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity;
import com.hnac.hzims.spare.entity.SpTemporaryStockEntity; import com.hnac.hzims.spare.entity.SpTemporaryStockEntity;
import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity;
import com.hnac.hzims.spare.vo.SparePartVO; import com.hnac.hzims.spare.vo.SparePartVO;
import com.hnac.hzims.spare.vo.WtSpBasicVO; import com.hnac.hzims.spare.vo.WtSpBasicVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -20,7 +21,7 @@ import java.util.Map;
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpBasicService extends BaseService<WtSpBasicEntity> { public interface IWtSpBasicService extends IService<WtSpBasicEntity> {
/** /**
* 基础信息列表 * 基础信息列表
* @param SP_BASIC * @param SP_BASIC

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java

@ -1,8 +1,9 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.WtSpManagementEntity; import com.hnac.hzims.spare.entity.WtSpManagementEntity;
import com.hnac.hzims.spare.vo.WtSpManagementVO; import com.hnac.hzims.spare.vo.WtSpManagementVO;
import org.springblade.core.mp.base.BaseService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@ -13,7 +14,7 @@ import java.util.Map;
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpManagementService extends BaseService<WtSpManagementEntity> { public interface IWtSpManagementService extends IService<WtSpManagementEntity> {
/** /**
* 新增 * 新增
* @param entity * @param entity

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java

@ -1,14 +1,14 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.WtSpProviderEntity; import com.hnac.hzims.spare.entity.WtSpProviderEntity;
import org.springblade.core.mp.base.BaseService;
/** /**
* 服务类 * 服务类
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpProviderService extends BaseService<WtSpProviderEntity> { public interface IWtSpProviderService extends IService<WtSpProviderEntity> {
} }

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java

@ -1,9 +1,10 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.WtSpToolBasicEntity; import com.hnac.hzims.spare.entity.WtSpToolBasicEntity;
import com.hnac.hzims.spare.vo.WtSpToolBasicVO; import com.hnac.hzims.spare.vo.WtSpToolBasicVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import java.util.List; import java.util.List;
@ -13,7 +14,7 @@ import java.util.List;
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpToolBasicService extends BaseService<WtSpToolBasicEntity> { public interface IWtSpToolBasicService extends IService<WtSpToolBasicEntity> {
/** /**
* 工具台账列表 * 工具台账列表
* @param toolBasicEntity * @param toolBasicEntity

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java

@ -1,10 +1,11 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.spare.entity.WtSpTotalEntity; import com.hnac.hzims.spare.entity.WtSpTotalEntity;
import com.hnac.hzims.spare.vo.StockVo; import com.hnac.hzims.spare.vo.StockVo;
import com.hnac.hzims.spare.vo.WtSpToolVO; import com.hnac.hzims.spare.vo.WtSpToolVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -14,7 +15,7 @@ import java.util.Map;
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpTotalService extends BaseService<WtSpTotalEntity> { public interface IWtSpTotalService extends IService<WtSpTotalEntity> {
/** /**
* 新增预警 * 新增预警

6
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java

@ -1,10 +1,10 @@
package com.hnac.hzims.spare.service; package com.hnac.hzims.spare.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.mp.support.Query;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hnac.hzims.spare.entity.WtSpWarehouseEntity; import com.hnac.hzims.spare.entity.WtSpWarehouseEntity;
import com.hnac.hzims.spare.vo.WtSpWarehouseVO; import com.hnac.hzims.spare.vo.WtSpWarehouseVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query;
import java.util.List; import java.util.List;
@ -13,7 +13,7 @@ import java.util.List;
* *
* @author Chill * @author Chill
*/ */
public interface IWtSpWarehouseService extends BaseService<WtSpWarehouseEntity> { public interface IWtSpWarehouseService extends IService<WtSpWarehouseEntity> {
/** /**

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java

@ -2,6 +2,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.chche.AssetsNumCache; import com.hnac.hzims.spare.chche.AssetsNumCache;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
@ -15,7 +16,7 @@ import lombok.AllArgsConstructor;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
@ -45,7 +46,7 @@ import java.util.Map;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpAllocationServiceImpl extends BaseServiceImpl<SpAllocationMapper, SpAllocationEntity> implements ISpAllocationService { public class SpAllocationServiceImpl extends ServiceImpl<SpAllocationMapper, SpAllocationEntity> implements ISpAllocationService {
private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class);

7
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java

@ -3,6 +3,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.chche.AssetsNumCache; import com.hnac.hzims.spare.chche.AssetsNumCache;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
@ -16,7 +17,7 @@ import lombok.AllArgsConstructor;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
@ -45,7 +46,7 @@ import java.util.Map;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpReceiveServiceImpl extends BaseServiceImpl<SpReceiveMapper, SpReceiveEntity> implements ISpReceiveService { public class SpReceiveServiceImpl extends ServiceImpl<SpReceiveMapper, SpReceiveEntity> implements ISpReceiveService {
private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class);
private ISpRecordService recordService; private ISpRecordService recordService;
@ -277,7 +278,7 @@ public class SpReceiveServiceImpl extends BaseServiceImpl<SpReceiveMapper, SpRec
params.put("type", BusinessType.RECEIVE.getType()); params.put("type", BusinessType.RECEIVE.getType());
List<SpRecordEntity> list = spRecordMapper.selectList(params); List<SpRecordEntity> list = spRecordMapper.selectList(params);
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
recordService.deleteLogic(Func.toLongList(list.get(i).getId()+"")); recordService.removeBatchByIds(Func.toLongList(list.get(i).getId()+""));
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("spBasicId",list.get(i).getSpBasicId()); map.put("spBasicId",list.get(i).getSpBasicId());
map.put("warehouseId",list.get(i).getWarehouseId()); map.put("warehouseId",list.get(i).getWarehouseId());

12
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceivesServiceImpl.java

@ -2,6 +2,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
import com.hnac.hzims.spare.mapper.SpReceivesMapper; import com.hnac.hzims.spare.mapper.SpReceivesMapper;
@ -11,7 +12,6 @@ import com.hnac.hzims.spare.service.*;
import com.hnac.hzims.spare.vo.SpReceivesVO; import com.hnac.hzims.spare.vo.SpReceivesVO;
import com.hnac.hzims.spare.vo.WtSpBasicVO; import com.hnac.hzims.spare.vo.WtSpBasicVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
@ -23,9 +23,9 @@ import org.springblade.system.feign.ISysClient;
import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.User;
import org.springblade.system.user.feign.IUserClient; import org.springblade.system.user.feign.IUserClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*; import java.util.*;
@ -36,7 +36,7 @@ import java.util.*;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpReceivesServiceImpl extends BaseServiceImpl<SpReceivesMapper, SpReceivesEntity> implements ISpReceivesService { public class SpReceivesServiceImpl extends ServiceImpl<SpReceivesMapper, SpReceivesEntity> implements ISpReceivesService {
private ISpRecordService recordService; private ISpRecordService recordService;
private SpRecordMapper spRecordMapper; private SpRecordMapper spRecordMapper;
@ -78,7 +78,7 @@ public class SpReceivesServiceImpl extends BaseServiceImpl<SpReceivesMapper, SpR
// params.put("type", BusinessType.RETURN.getType()); // params.put("type", BusinessType.RETURN.getType());
// List<SpRecordEntity> list = spRecordMapper.selectList(params); // List<SpRecordEntity> list = spRecordMapper.selectList(params);
// for (int i = 0; i < list.size(); i++) { // for (int i = 0; i < list.size(); i++) {
// recordService.deleteLogic(Func.toLongList(list.get(i).getId()+"")); // recordService.removeByIds(Func.toLongList(list.get(i).getId()+""));
// Map<String,Object> map = new HashMap<>(); // Map<String,Object> map = new HashMap<>();
// map.put("spBasicId",list.get(i).getSpBasicId()); // map.put("spBasicId",list.get(i).getSpBasicId());
// map.put("warehouseId",list.get(i).getWarehouseId()); // map.put("warehouseId",list.get(i).getWarehouseId());
@ -137,7 +137,7 @@ public class SpReceivesServiceImpl extends BaseServiceImpl<SpReceivesMapper, SpR
params.put("type", BusinessType.RETURN.getType()); params.put("type", BusinessType.RETURN.getType());
List<SpRecordEntity> list = spRecordMapper.selectList(params); List<SpRecordEntity> list = spRecordMapper.selectList(params);
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
recordService.deleteLogic(Func.toLongList(list.get(i).getId()+"")); recordService.removeBatchByIds(Func.toLongList(list.get(i).getId()+""));
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("spBasicId",list.get(i).getSpBasicId()); map.put("spBasicId",list.get(i).getSpBasicId());
map.put("warehouseId",list.get(i).getWarehouseId()); map.put("warehouseId",list.get(i).getWarehouseId());

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRecordServiceImpl.java

@ -1,9 +1,9 @@
package com.hnac.hzims.spare.service.impl; package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.SpRecordEntity; import com.hnac.hzims.spare.entity.SpRecordEntity;
import com.hnac.hzims.spare.mapper.SpRecordMapper; import com.hnac.hzims.spare.mapper.SpRecordMapper;
import com.hnac.hzims.spare.service.ISpRecordService; import com.hnac.hzims.spare.service.ISpRecordService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
* @author Chill * @author Chill
*/ */
@Service @Service
public class SpRecordServiceImpl extends BaseServiceImpl<SpRecordMapper, SpRecordEntity> implements ISpRecordService { public class SpRecordServiceImpl extends ServiceImpl<SpRecordMapper, SpRecordEntity> implements ISpRecordService {
} }

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRevertServiceImpl.java

@ -1,10 +1,10 @@
package com.hnac.hzims.spare.service.impl; package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.SpRevertEntity; import com.hnac.hzims.spare.entity.SpRevertEntity;
import com.hnac.hzims.spare.mapper.SpRevertMapper; import com.hnac.hzims.spare.mapper.SpRevertMapper;
import com.hnac.hzims.spare.service.ISpRevertService; import com.hnac.hzims.spare.service.ISpRevertService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -14,6 +14,6 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpRevertServiceImpl extends BaseServiceImpl<SpRevertMapper, SpRevertEntity> implements ISpRevertService { public class SpRevertServiceImpl extends ServiceImpl<SpRevertMapper, SpRevertEntity> implements ISpRevertService {
} }

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpTicketRelationServiceImpl.java

@ -1,9 +1,9 @@
package com.hnac.hzims.spare.service.impl; package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.SpTicketRelationEntity; import com.hnac.hzims.spare.entity.SpTicketRelationEntity;
import com.hnac.hzims.spare.mapper.SpTicketRelationMapper; import com.hnac.hzims.spare.mapper.SpTicketRelationMapper;
import com.hnac.hzims.spare.service.ISpTicketRelationService; import com.hnac.hzims.spare.service.ISpTicketRelationService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -14,7 +14,7 @@ import java.util.List;
* @author Chill * @author Chill
*/ */
@Service @Service
public class SpTicketRelationServiceImpl extends BaseServiceImpl<SpTicketRelationMapper, SpTicketRelationEntity> implements ISpTicketRelationService { public class SpTicketRelationServiceImpl extends ServiceImpl<SpTicketRelationMapper, SpTicketRelationEntity> implements ISpTicketRelationService {
@Override @Override
public void deleteSpTicketRelation(List<String> list) { public void deleteSpTicketRelation(List<String> list) {

10
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java

@ -3,6 +3,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.chche.AssetsNumCache; import com.hnac.hzims.spare.chche.AssetsNumCache;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
@ -17,26 +18,19 @@ import com.hnac.hzims.spare.vo.WtSpManagementVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.entity.Dept; import org.springblade.system.entity.Dept;
import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.ISysClient;
import org.springblade.system.user.cache.UserCache;
import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.User;
import org.springblade.system.user.feign.IUserClient; import org.springblade.system.user.feign.IUserClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
@ -52,7 +46,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpWarehouseInServiceImpl extends BaseServiceImpl<SpWarehouseInMapper, SpWarehouseInEntity> implements ISpWarehouseInService { public class SpWarehouseInServiceImpl extends ServiceImpl<SpWarehouseInMapper, SpWarehouseInEntity> implements ISpWarehouseInService {
private static final Logger logger = LoggerFactory.getLogger(SpWarehouseInServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SpWarehouseInServiceImpl.class);

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java

@ -3,6 +3,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.chche.AssetsNumCache; import com.hnac.hzims.spare.chche.AssetsNumCache;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
@ -18,7 +19,6 @@ import lombok.AllArgsConstructor;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
@ -44,7 +44,7 @@ import java.util.*;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SpWarehouseOutServiceImpl extends BaseServiceImpl<SpWarehouseOutMapper, SpWarehouseOutEntity> implements ISpWarehouseOutService { public class SpWarehouseOutServiceImpl extends ServiceImpl<SpWarehouseOutMapper, SpWarehouseOutEntity> implements ISpWarehouseOutService {
private static final Logger logger = LoggerFactory.getLogger(SpWarehouseOutServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SpWarehouseOutServiceImpl.class);

11
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java

@ -2,7 +2,6 @@ package com.hnac.hzims.spare.service.impl;
import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.ImportParams;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.converters.longconverter.LongStringConverter; import com.alibaba.excel.converters.longconverter.LongStringConverter;
@ -15,6 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.common.logs.utils.StringUtils;
import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.feign.IEmInfoClient;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.WarehouseInType; import com.hnac.hzims.spare.enume.WarehouseInType;
@ -35,12 +36,9 @@ import com.hnac.hzims.ticket.allTicket.fegin.ITicketInfoAllClient;
import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springblade.core.excel.support.ExcelException;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
@ -59,7 +57,6 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceException;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -79,7 +76,7 @@ import static com.hnac.hzims.spare.utils.ExcelUtil.asyncReadModel;
@Slf4j @Slf4j
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpBasicServiceImpl extends BaseServiceImpl<WtSpBasicMapper, WtSpBasicEntity> implements IWtSpBasicService { public class WtSpBasicServiceImpl extends ServiceImpl<WtSpBasicMapper, WtSpBasicEntity> implements IWtSpBasicService {
private static final Logger LOGGER = LoggerFactory.getLogger(WtSpBasicServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(WtSpBasicServiceImpl.class);
private WtSpManagementMapper managementMapper; private WtSpManagementMapper managementMapper;
@ -520,7 +517,7 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl<WtSpBasicMapper, WtSpB
map.put("success", "false"); map.put("success", "false");
map.put("msg", "库存填写模板导出失败" + e.getMessage()); map.put("msg", "库存填写模板导出失败" + e.getMessage());
try { try {
response.getWriter().println(JSONUtils.toJSONString(map)); response.getWriter().println(JSON.toJSONString(map));
} catch (IOException e3) { } catch (IOException e3) {
throw new ServiceException("发生异常 :" + e); throw new ServiceException("发生异常 :" + e);
} }

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpManagementServiceImpl.java

@ -1,5 +1,6 @@
package com.hnac.hzims.spare.service.impl; package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.WtSpManagementEntity; import com.hnac.hzims.spare.entity.WtSpManagementEntity;
import com.hnac.hzims.spare.entity.WtSpManagementeExcelEntity; import com.hnac.hzims.spare.entity.WtSpManagementeExcelEntity;
import com.hnac.hzims.spare.mapper.WtSpManagementMapper; import com.hnac.hzims.spare.mapper.WtSpManagementMapper;
@ -8,7 +9,6 @@ import com.hnac.hzims.spare.vo.WtSpManagementVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
@ -27,7 +27,7 @@ import java.util.Map;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpManagementServiceImpl extends BaseServiceImpl<WtSpManagementMapper, WtSpManagementEntity> implements IWtSpManagementService { public class WtSpManagementServiceImpl extends ServiceImpl<WtSpManagementMapper, WtSpManagementEntity> implements IWtSpManagementService {
private WtSpManagementMapper wtSpManagementMapper; private WtSpManagementMapper wtSpManagementMapper;

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpProviderServiceImpl.java

@ -1,10 +1,10 @@
package com.hnac.hzims.spare.service.impl; package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.WtSpProviderEntity; import com.hnac.hzims.spare.entity.WtSpProviderEntity;
import com.hnac.hzims.spare.mapper.WtSpProviderMapper; import com.hnac.hzims.spare.mapper.WtSpProviderMapper;
import com.hnac.hzims.spare.service.IWtSpProviderService; import com.hnac.hzims.spare.service.IWtSpProviderService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -14,6 +14,6 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpProviderServiceImpl extends BaseServiceImpl<WtSpProviderMapper, WtSpProviderEntity> implements IWtSpProviderService { public class WtSpProviderServiceImpl extends ServiceImpl<WtSpProviderMapper, WtSpProviderEntity> implements IWtSpProviderService {
} }

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java

@ -2,6 +2,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.entity.*;
import com.hnac.hzims.spare.enume.BusinessType; import com.hnac.hzims.spare.enume.BusinessType;
import com.hnac.hzims.spare.mapper.*; import com.hnac.hzims.spare.mapper.*;
@ -9,7 +10,6 @@ import com.hnac.hzims.spare.service.IWtSpBasicService;
import com.hnac.hzims.spare.service.IWtSpToolBasicService; import com.hnac.hzims.spare.service.IWtSpToolBasicService;
import com.hnac.hzims.spare.vo.WtSpToolBasicVO; import com.hnac.hzims.spare.vo.WtSpToolBasicVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
@ -32,7 +32,7 @@ import java.util.Map;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpToolBasicServiceImpl extends BaseServiceImpl<WtSpToolBasicMapper, WtSpToolBasicEntity> implements IWtSpToolBasicService { public class WtSpToolBasicServiceImpl extends ServiceImpl<WtSpToolBasicMapper, WtSpToolBasicEntity> implements IWtSpToolBasicService {
private IWtSpBasicService spBasicService; private IWtSpBasicService spBasicService;

4
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpTotalServiceImpl.java

@ -2,6 +2,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity;
import com.hnac.hzims.spare.entity.WtSpManagementEntity; import com.hnac.hzims.spare.entity.WtSpManagementEntity;
import com.hnac.hzims.spare.entity.WtSpTotalEntity; import com.hnac.hzims.spare.entity.WtSpTotalEntity;
@ -14,7 +15,6 @@ import com.hnac.hzims.spare.vo.StockVo;
import com.hnac.hzims.spare.vo.WtSpToolVO; import com.hnac.hzims.spare.vo.WtSpToolVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
@ -35,7 +35,7 @@ import java.util.Map;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpTotalServiceImpl extends BaseServiceImpl<WtSpTotalMapper, WtSpTotalEntity> implements IWtSpTotalService { public class WtSpTotalServiceImpl extends ServiceImpl<WtSpTotalMapper, WtSpTotalEntity> implements IWtSpTotalService {
private IWtSpWarehouseService wtSpWarehouseService; private IWtSpWarehouseService wtSpWarehouseService;

5
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java

@ -3,6 +3,7 @@ package com.hnac.hzims.spare.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.spare.entity.WtSpWarehouseEntity; import com.hnac.hzims.spare.entity.WtSpWarehouseEntity;
import com.hnac.hzims.spare.mapper.WtSpWarehouseMapper; import com.hnac.hzims.spare.mapper.WtSpWarehouseMapper;
import com.hnac.hzims.spare.service.IWtSpWarehouseService; import com.hnac.hzims.spare.service.IWtSpWarehouseService;
@ -11,10 +12,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.system.entity.Dept; import org.springblade.system.entity.Dept;
@ -35,7 +34,7 @@ import java.util.List;
@Slf4j @Slf4j
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WtSpWarehouseServiceImpl extends BaseServiceImpl<WtSpWarehouseMapper, WtSpWarehouseEntity> implements IWtSpWarehouseService { public class WtSpWarehouseServiceImpl extends ServiceImpl<WtSpWarehouseMapper, WtSpWarehouseEntity> implements IWtSpWarehouseService {
private ISysClient sysClient; private ISysClient sysClient;

44
hzims-service/assets/src/main/resources/application-dev.yml

@ -1,44 +0,0 @@
#服务器端口
server:
port: 8599
#数据源配置
#spring:
# datasource:
# url: ${blade.datasource.dev.url}
# username: ${blade.datasource.dev.username}
# password: ${blade.datasource.dev.password}
spring:
#排除DruidDataSourceAutoConfigure
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
dynamic:
#设置默认的数据源或者数据源组,默认值即为master
primary: master
datasource:
master:
url: jdbc:mysql://175.6.40.67:5816/dev_hzims_assets?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: 123
slave:
url: jdbc:mysql://175.6.40.67:5816/dev_hzims_assets?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: 123
#xxl:
# job:
# accessToken: ''
# admin:
# addresses: http://192.168.1.25:7009/xxl-job-admin
# executor:
# appname: hzims-equipment
# ip: 192.168.1.28
# logpath: /data/applogs/xxl-job/jobhandler
# logretentiondays: -1
# port: 28210
demo:
name: aaa

28
hzims-service/assets/src/main/resources/application-prod.yml

@ -1,28 +0,0 @@
#服务器端口
server:
port: 8200
#数据源配置
#spring:
# datasource:
# url: ${blade.datasource.prod.url}
# username: ${blade.datasource.prod.username}
# password: ${blade.datasource.prod.password}
spring:
#排除DruidDataSourceAutoConfigure
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
dynamic:
#设置默认的数据源或者数据源组,默认值即为master
primary: master
datasource:
master:
url: ${blade.datasource.demo.master.url}
username: ${blade.datasource.demo.master.username}
password: ${blade.datasource.demo.master.password}
slave:
url: ${blade.datasource.demo.slave.url}
username: ${blade.datasource.demo.slave.username}
password: ${blade.datasource.demo.slave.password}

28
hzims-service/assets/src/main/resources/application-test.yml

@ -1,28 +0,0 @@
#服务器端口
server:
port: 8200
#数据源配置
#spring:
# datasource:
# url: ${blade.datasource.test.url}
# username: ${blade.datasource.test.username}
# password: ${blade.datasource.test.password}
spring:
#排除DruidDataSourceAutoConfigure
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
dynamic:
#设置默认的数据源或者数据源组,默认值即为master
primary: master
datasource:
master:
url: ${blade.datasource.demo.master.url}
username: ${blade.datasource.demo.master.username}
password: ${blade.datasource.demo.master.password}
slave:
url: ${blade.datasource.demo.slave.url}
username: ${blade.datasource.demo.slave.username}
password: ${blade.datasource.demo.slave.password}

24
hzims-service/assets/src/main/resources/application.yml

@ -1,24 +0,0 @@
#mybatis-plus配置
mybatis-plus:
mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.hnac.hzims.**.entity
#swagger扫描路径配置
swagger:
base-packages:
- org.springbalde
- com.hnac
#oss配置
oss:
enabled: true
name: minio
tenant-mode: false
endpoint: http://127.0.0.1:9000
access-key: D99KGE6ZTQXSATTJWU24
secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
bucket-name: bladex

69
hzims-service/assets/src/main/resources/template/template.yml

@ -0,0 +1,69 @@
#服务器端口
server:
port: 8599
#mybatis-plus配置
mybatis-plus:
mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.hnac.hzims.**.entity
#数据源配置
#spring:
# datasource:
# url: ${blade.datasource.dev.url}
# username: ${blade.datasource.dev.username}
# password: ${blade.datasource.dev.password}
spring:
#排除DruidDataSourceAutoConfigure
autoconfigure:
exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_assets?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: ${hzinfo.db.busines.username}
password: ${hzinfo.db.busines.password}
#swagger扫描路径配置
swagger:
base-packages: com.hnac.hzims.spare
#oss配置
oss:
endpoint: "${hzinfo.oss.endpoint}"
access-key: "${hzinfo.oss.access-key}"
secret-key: "${hzinfo.oss.secret-key}"
xxl:
job:
accessToken: ''
admin:
addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
executor:
appname: hzims-safeproduct
ip: "${hzims.server.ip}"
logpath: /data/applogs/xxl-job/jobhandler
logretentiondays: 7
port: 28599
#xxl:
# job:
# accessToken: ''
# admin:
# addresses: http://192.168.1.25:7009/xxl-job-admin
# executor:
# appname: hzims-equipment
# ip: 192.168.1.28
# logpath: /data/applogs/xxl-job/jobhandler
# logretentiondays: -1
# port: 28210
demo:
name: aaa

2
hzims-service/equipment/pom.xml

@ -47,7 +47,7 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>2.5.6</version> <version>3.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>

18
hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java

@ -19,9 +19,11 @@ package com.hnac.hzims;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.cloud.feign.EnableBladeFeign;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
@ -30,21 +32,23 @@ import org.springframework.scheduling.annotation.EnableScheduling;
* *
* @author Chill * @author Chill
*/ */
@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"})
@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
@SpringCloudApplication @SpringCloudApplication
@MapperScan("com.hnac.hzims.**.mapper.**") @MapperScan("com.hnac.hzims.**.mapper")
@EnableScheduling @EnableScheduling
@ComponentScan(basePackages = {"com.hnac.hzims.*"}) @ComponentScan(basePackages = {"com.hnac.hzims.*"})
public class EquipmentApplication extends SpringBootServletInitializer { public class EquipmentApplication {
public static void main(String[] args) { public static void main(String[] args) {
BladeApplication.run(EquipmentConstants.APP_NAME, EquipmentApplication.class, args); BladeApplication.run(EquipmentConstants.APP_NAME, EquipmentApplication.class, args);
} }
@Override // @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { // protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return BladeApplication.createSpringApplicationBuilder(builder, EquipmentConstants.APP_NAME, EquipmentApplication.class); // return BladeApplication.createSpringApplicationBuilder(builder, EquipmentConstants.APP_NAME, EquipmentApplication.class);
} // }
} }

7
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java

@ -1,12 +1,13 @@
package com.hnac.hzims.emParam.service; package com.hnac.hzims.emParam.service;
import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity;
import com.hnac.hzims.emParam.vo.ParamBackupsDetailTreeVO; import com.hnac.hzims.emParam.vo.ParamBackupsDetailTreeVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List; import java.util.List;
public interface IParamBackupsDetailService extends BaseService<ParamBackupsDetailEntity> { public interface IParamBackupsDetailService extends IService<ParamBackupsDetailEntity> {
List<ParamBackupsDetailTreeVO> getBackupsParamTree(Long backupsId); List<ParamBackupsDetailTreeVO> getBackupsParamTree(Long backupsId);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java

@ -1,18 +1,19 @@
package com.hnac.hzims.emParam.service; package com.hnac.hzims.emParam.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.common.utils.Condition; import com.hnac.hzims.common.utils.Condition;
import com.hnac.hzims.emParam.dto.ParamBackupsDTO; import com.hnac.hzims.emParam.dto.ParamBackupsDTO;
import com.hnac.hzims.emParam.entity.ParamBackupsEntity; import com.hnac.hzims.emParam.entity.ParamBackupsEntity;
import com.hnac.hzims.emParam.vo.ParamBackupsVO; import com.hnac.hzims.emParam.vo.ParamBackupsVO;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
public interface IParamBackupsService extends BaseService<ParamBackupsEntity> { public interface IParamBackupsService extends IService<ParamBackupsEntity> {
Boolean save(ParamBackupsDTO request); Boolean save(ParamBackupsDTO request);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java

@ -1,7 +1,8 @@
package com.hnac.hzims.emParam.service; package com.hnac.hzims.emParam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.emParam.entity.ParamModelEntity; import com.hnac.hzims.emParam.entity.ParamModelEntity;
import org.springblade.core.mp.base.BaseService;
public interface IParamModelService extends BaseService<ParamModelEntity> {
public interface IParamModelService extends IService<ParamModelEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsDetailServiceImpl.java

@ -2,6 +2,7 @@ package com.hnac.hzims.emParam.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity; import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity;
import com.hnac.hzims.emParam.mapper.ParamBackupsDetailMapper; import com.hnac.hzims.emParam.mapper.ParamBackupsDetailMapper;
@ -11,7 +12,7 @@ import com.hnac.hzims.emParam.vo.ParamBackupsDetailVO;
import com.hnac.hzims.emParam.wrapper.ParamBackupsDetailWrapper; import com.hnac.hzims.emParam.wrapper.ParamBackupsDetailWrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.CollectionUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -23,7 +24,7 @@ import java.util.stream.Collectors;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@Slf4j @Slf4j
public class ParamBackupsDetailServiceImpl extends BaseServiceImpl<ParamBackupsDetailMapper, ParamBackupsDetailEntity> implements IParamBackupsDetailService { public class ParamBackupsDetailServiceImpl extends ServiceImpl<ParamBackupsDetailMapper, ParamBackupsDetailEntity> implements IParamBackupsDetailService {
@Override @Override

10
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsServiceImpl.java

@ -3,6 +3,7 @@ package com.hnac.hzims.emParam.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.emParam.dto.ParamBackupsDTO; import com.hnac.hzims.emParam.dto.ParamBackupsDTO;
import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity; import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity;
import com.hnac.hzims.emParam.entity.ParamBackupsEntity; import com.hnac.hzims.emParam.entity.ParamBackupsEntity;
@ -20,8 +21,6 @@ import com.hnac.hzinfo.sdk.v5.control.dto.Ctrl;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.CollectionUtil;
@ -31,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import javax.annotation.Resource;
import javax.sql.rowset.serial.SerialException; import javax.sql.rowset.serial.SerialException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -41,11 +41,11 @@ import java.util.stream.Collectors;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@Slf4j @Slf4j
public class ParamBackupsServiceImpl extends BaseServiceImpl<ParamBackupsMapper, ParamBackupsEntity> implements IParamBackupsService { public class ParamBackupsServiceImpl extends ServiceImpl<ParamBackupsMapper, ParamBackupsEntity> implements IParamBackupsService {
private final IParamBackupsDetailService detailService; private final IParamBackupsDetailService detailService;
private final ControlClient controlClient; private final ControlClient controlClient;
private final BladeLogger logger;
@Override @Override
@Transactional @Transactional
@ -118,7 +118,7 @@ public class ParamBackupsServiceImpl extends BaseServiceImpl<ParamBackupsMapper,
log.info("{}", JSON.toJSONString(controlBatchDTO)); log.info("{}", JSON.toJSONString(controlBatchDTO));
Result<Object> result = controlClient.batchSendToDevice(controlBatchDTO); Result<Object> result = controlClient.batchSendToDevice(controlBatchDTO);
if(!result.isSuccess()) { if(!result.isSuccess()) {
logger.error("equipment:ParamServiceImpl:distribute", "下发参数传参为:" + JSON.toJSONString(controlBatchDTO) + ";下发结果为:" + JSON.toJSONString(result)); log.error("equipment:ParamServiceImpl:distribute", "下发参数传参为:" + JSON.toJSONString(controlBatchDTO) + ";下发结果为:" + JSON.toJSONString(result));
throw new ServiceException("参数还原调用下发接口失败,返回结果为:"+result.getMsg()); throw new ServiceException("参数还原调用下发接口失败,返回结果为:"+result.getMsg());
} }
}); });

7
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamModelServiceImpl.java

@ -1,17 +1,18 @@
package com.hnac.hzims.emParam.service.impl; package com.hnac.hzims.emParam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.emParam.entity.ParamModelEntity; import com.hnac.hzims.emParam.entity.ParamModelEntity;
import com.hnac.hzims.emParam.mapper.ParamModelMapper; import com.hnac.hzims.emParam.mapper.ParamModelMapper;
import com.hnac.hzims.emParam.service.IParamModelService; import com.hnac.hzims.emParam.service.IParamModelService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@Slf4j @Slf4j
public class ParamModelServiceImpl extends BaseServiceImpl<ParamModelMapper, ParamModelEntity> implements IParamModelService { public class ParamModelServiceImpl extends ServiceImpl<ParamModelMapper, ParamModelEntity> implements IParamModelService {
} }

4
hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamServiceImpl.java

@ -31,7 +31,6 @@ import com.hnac.hzinfo.sdk.v5.redis.RedisClient;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*; import org.springblade.core.tool.utils.*;
@ -55,7 +54,6 @@ public class ParamServiceImpl implements IParamService {
private final ControlClient controlClient; private final ControlClient controlClient;
private final DeviceClient deviceClient; private final DeviceClient deviceClient;
private final RedisClient redisClient; private final RedisClient redisClient;
private final BladeLogger logger;
private final IEmInfoService emInfoService; private final IEmInfoService emInfoService;
private final DeviceDataClient deviceDataClient; private final DeviceDataClient deviceDataClient;
private final IAnalyseDataSearchClient analyseDataSearchClient; private final IAnalyseDataSearchClient analyseDataSearchClient;
@ -134,7 +132,7 @@ public class ParamServiceImpl implements IParamService {
log.info("{}",JSON.toJSONString(controlBatchDTO)); log.info("{}",JSON.toJSONString(controlBatchDTO));
Result<Object> result = controlClient.batchSendToDevice(controlBatchDTO); Result<Object> result = controlClient.batchSendToDevice(controlBatchDTO);
if(!result.isSuccess()) { if(!result.isSuccess()) {
logger.error("equipment:ParamServiceImpl:distribute","下发参数传参为:"+JSON.toJSONString(controlBatchDTO)+";下发结果为:"+JSON.toJSONString(result)); log.error("equipment:ParamServiceImpl:distribute","下发参数传参为:"+JSON.toJSONString(controlBatchDTO)+";下发结果为:"+JSON.toJSONString(result));
return result; return result;
} }
LambdaUpdateWrapper<EmInfoEntity> updateWrapper = Wrappers.<EmInfoEntity>lambdaUpdate().set(EmInfoEntity::getLastDistributeTime, LocalDateTime.now()).eq(EmInfoEntity::getNumber, req.getEmCode()); LambdaUpdateWrapper<EmInfoEntity> updateWrapper = Wrappers.<EmInfoEntity>lambdaUpdate().set(EmInfoEntity::getLastDistributeTime, LocalDateTime.now()).eq(EmInfoEntity::getNumber, req.getEmCode());

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java

@ -73,7 +73,7 @@ public class EmAssociationController extends BladeController {
@DeleteMapping() @DeleteMapping()
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
public R<Integer> delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){ public R<Integer> delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
return R.status(emAssociationService.deleteLogic(Func.toLongList(ids))); return R.status(emAssociationService.removeByIds(Func.toLongList(ids)));
} }
} }

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java

@ -75,7 +75,7 @@ public class EmAssociationDetailController extends BladeController {
@DeleteMapping() @DeleteMapping()
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
public R<Integer> delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){ public R<Integer> delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
return R.status(emAssociationDetailService.deleteLogic(Func.toLongList(ids))); return R.status(emAssociationDetailService.removeByIds(Func.toLongList(ids)));
} }

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAttachController.java

@ -96,7 +96,7 @@ public class EmAttachController extends BladeController {
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(em_attachService.deleteLogic(Func.toLongList(ids))); return R.status(em_attachService.removeByIds(Func.toLongList(ids)));
} }
} }

10
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java

@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -82,7 +82,7 @@ public class EmInfoController extends BladeController {
/** /**
* 设备列表 分页 * 设备列表 分页
*/ */
@ApiLog
@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "设备分页", notes = "传入em_info") @ApiOperation(value = "设备分页", notes = "传入em_info")
@ -117,7 +117,7 @@ public class EmInfoController extends BladeController {
/** /**
* 查看子设备列表 分页(树结构) * 查看子设备列表 分页(树结构)
*/ */
@ApiLog
@RequestMapping(value = "/treeList") @RequestMapping(value = "/treeList")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "查看子设备列表 分页(树结构)", notes = "传入设备id") @ApiOperation(value = "查看子设备列表 分页(树结构)", notes = "传入设备id")
@ -186,7 +186,7 @@ public class EmInfoController extends BladeController {
* @param name 设备名称 * @param name 设备名称
* @return * @return
*/ */
@ApiLog
@RequestMapping(value = "/getEmInfoTreeList") @RequestMapping(value = "/getEmInfoTreeList")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "获取所有设备列表(树结构)", notes = "传入设备id") @ApiOperation(value = "获取所有设备列表(树结构)", notes = "传入设备id")
@ -400,7 +400,7 @@ public class EmInfoController extends BladeController {
/** /**
* 获取设备的备品备件 * 获取设备的备品备件
*/ */
@ApiLog
@GetMapping("/getSparePart") @GetMapping("/getSparePart")
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 10)
@ApiOperation(value = "获取设备的备品备件") @ApiOperation(value = "获取设备的备品备件")

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelController.java

@ -96,7 +96,7 @@ public class EmModelController extends BladeController {
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(em_modelService.deleteLogic(Func.toLongList(ids))); return R.status(em_modelService.removeByIds(Func.toLongList(ids)));
} }
} }

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelParamController.java

@ -111,7 +111,7 @@ public class EmModelParamController extends BladeController {
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(em_model_paramService.deleteLogic(Func.toLongList(ids))); return R.status(em_model_paramService.removeByIds(Func.toLongList(ids)));
} }
} }

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmOreanizationController.java

@ -167,7 +167,7 @@ public class EmOreanizationController extends BladeController {
} }
} }
return R.status(em_oreanizationService.deleteLogic(Func.toLongList(ids))); return R.status(em_oreanizationService.removeByIds(Func.toLongList(ids)));
} }
/** /**

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmParamController.java

@ -104,7 +104,7 @@ public class EmParamController extends BladeController {
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
boolean b = em_paramService.deleteLogic(Func.toLongList(ids)); boolean b = em_paramService.removeByIds(Func.toLongList(ids));
return R.status(b); return R.status(b);
} }

6
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java

@ -12,7 +12,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -49,7 +49,7 @@ public class PlanGenertionController {
/** /**
* 分页 代码自定义代号 * 分页 代码自定义代号
*/ */
@ApiLog
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@OperationAnnotation(moduleName = "数据填报",title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType = @OperationAnnotation(moduleName = "数据填报",title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType =
@ -89,7 +89,7 @@ public class PlanGenertionController {
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids") @ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids))); return R.status(service.removeByIds(Func.toLongList(ids)));
} }

12
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java

@ -1,20 +1,8 @@
package com.hnac.hzims.equipment.controller; package com.hnac.hzims.equipment.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.hnac.hzims.equipment.service.IUpdateDeptIdService; import com.hnac.hzims.equipment.service.IUpdateDeptIdService;
import com.hnac.hzims.equipment.vo.UpdateDeptIdByTenantIdVO;
import com.hnac.hzims.equipment.vo.UpdateDeptVo;
import com.hnac.hzims.equipment.vo.UpdateTenantVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import oracle.net.aso.u;
import org.apache.commons.lang.StringUtils;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

10
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java

@ -2,9 +2,6 @@ package com.hnac.hzims.equipment.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
import com.hnac.hzims.common.logs.enums.BusinessType;
import com.hnac.hzims.common.logs.enums.OperatorType;
import com.hnac.hzims.equipment.dto.WorkshopInfoDTO; import com.hnac.hzims.equipment.dto.WorkshopInfoDTO;
import com.hnac.hzims.equipment.service.IEmParamService; import com.hnac.hzims.equipment.service.IEmParamService;
import com.hnac.hzims.equipment.service.IWorkshopInfoService; import com.hnac.hzims.equipment.service.IWorkshopInfoService;
@ -12,9 +9,8 @@ import com.hnac.hzims.equipment.vo.WorkShopInfoVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.apiguardian.api.API;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -59,7 +55,7 @@ public class WorkshopInfoController extends BladeController {
return R.success("更新成功"); return R.success("更新成功");
} }
@ApiLog
@RequestMapping(value = "/listPage",method = RequestMethod.GET) @RequestMapping(value = "/listPage",method = RequestMethod.GET)
@ApiOperation("列表分页查询") @ApiOperation("列表分页查询")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ -78,7 +74,7 @@ public class WorkshopInfoController extends BladeController {
@ApiOperation("厂房删除") @ApiOperation("厂房删除")
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
public R<Boolean> remove(@PathVariable String ids) { public R<Boolean> remove(@PathVariable String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids))); return R.status(service.removeByIds(Func.toLongList(ids)));
} }
@RequestMapping(value = "/detail",method = RequestMethod.GET) @RequestMapping(value = "/detail",method = RequestMethod.GET)

1
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/WorkshopInfoClient.java

@ -7,7 +7,6 @@ import com.hnac.hzims.equipment.entity.WorkshopInfoEntity;
import com.hnac.hzims.equipment.service.IWorkshopInfoService; import com.hnac.hzims.equipment.service.IWorkshopInfoService;
import groovy.util.logging.Slf4j; import groovy.util.logging.Slf4j;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java

@ -1,11 +1,12 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity; import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity;
import org.springblade.core.mp.base.BaseService;
import java.util.Map; import java.util.Map;
public interface IEmAssociationDetailService extends BaseService<EmAssociationDetailEntity> { public interface IEmAssociationDetailService extends IService<EmAssociationDetailEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java

@ -1,11 +1,12 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmAssociationEntity; import com.hnac.hzims.equipment.entity.EmAssociationEntity;
import com.hnac.hzims.equipment.vo.EmAssociationVo; import com.hnac.hzims.equipment.vo.EmAssociationVo;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
public interface IEmAssociationService extends BaseService<EmAssociationEntity> { public interface IEmAssociationService extends IService<EmAssociationEntity> {
R insert(EmAssociationVo emAssociationVo); R insert(EmAssociationVo emAssociationVo);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java

@ -1,6 +1,7 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmAttachEntity; import com.hnac.hzims.equipment.entity.EmAttachEntity;
/** /**
@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmAttachEntity;
* *
* @author Chill * @author Chill
*/ */
public interface IEmAttachService extends BaseService<EmAttachEntity> { public interface IEmAttachService extends IService<EmAttachEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java

@ -1,7 +1,8 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmDefinitionEntity; import com.hnac.hzims.equipment.entity.EmDefinitionEntity;
import org.springblade.core.mp.base.BaseService;
public interface IEmDefinitionService extends BaseService<EmDefinitionEntity> {
public interface IEmDefinitionService extends IService<EmDefinitionEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java

@ -1,12 +1,13 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.dto.DeviceTreeDTO; import com.hnac.hzims.equipment.dto.DeviceTreeDTO;
import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.entity.EmInfoEntity;
import com.hnac.hzims.equipment.vo.*; import com.hnac.hzims.equipment.vo.*;
import com.hnac.hzims.spare.vo.SparePartVO; import com.hnac.hzims.spare.vo.SparePartVO;
import com.hnac.hzinfo.inspect.obj.dto.ContentDTO; import com.hnac.hzinfo.inspect.obj.dto.ContentDTO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.system.vo.CreateTableVO; import org.springblade.system.vo.CreateTableVO;
@ -19,7 +20,7 @@ import java.util.Map;
* *
* @author Chill * @author Chill
*/ */
public interface IEmInfoService extends BaseService<EmInfoEntity> { public interface IEmInfoService extends IService<EmInfoEntity> {
String PUBLIC_TYPE = "1"; String PUBLIC_TYPE = "1";
String SET_TYPE = "2"; String SET_TYPE = "2";

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java

@ -1,6 +1,7 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmModelParamEntity; import com.hnac.hzims.equipment.entity.EmModelParamEntity;
/** /**
@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmModelParamEntity;
* *
* @author Chill * @author Chill
*/ */
public interface IEmModelParamService extends BaseService<EmModelParamEntity> { public interface IEmModelParamService extends IService<EmModelParamEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java

@ -1,6 +1,7 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmModelEntity; import com.hnac.hzims.equipment.entity.EmModelEntity;
/** /**
@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmModelEntity;
* *
* @author Chill * @author Chill
*/ */
public interface IEmModelService extends BaseService<EmModelEntity> { public interface IEmModelService extends IService<EmModelEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java

@ -1,8 +1,9 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmTreeNode; import com.hnac.hzims.equipment.entity.EmTreeNode;
import com.hnac.hzims.equipment.vo.EmOreanizationVO; import com.hnac.hzims.equipment.vo.EmOreanizationVO;
import org.springblade.core.mp.base.BaseService;
import com.hnac.hzims.equipment.entity.EmOreanizationEntity; import com.hnac.hzims.equipment.entity.EmOreanizationEntity;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.INode; import org.springblade.core.tool.node.INode;
@ -16,7 +17,7 @@ import java.util.List;
* *
* @author moze * @author moze
*/ */
public interface IEmOreanizationService extends BaseService<EmOreanizationEntity> { public interface IEmOreanizationService extends IService<EmOreanizationEntity> {
List<TreeNode> initLoad(String tenantId); List<TreeNode> initLoad(String tenantId);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java

@ -1,6 +1,7 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmParamEntity; import com.hnac.hzims.equipment.entity.EmParamEntity;
import java.util.List; import java.util.List;
@ -11,7 +12,7 @@ import java.util.Map;
* *
* @author Chill * @author Chill
*/ */
public interface IEmParamService extends BaseService<EmParamEntity> { public interface IEmParamService extends IService<EmParamEntity> {
Integer getInstalledCapacityCountByDepts(List<Long> depts); Integer getInstalledCapacityCountByDepts(List<Long> depts);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java

@ -1,7 +1,8 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmTreeBasicEntity; import com.hnac.hzims.equipment.entity.EmTreeBasicEntity;
import org.springblade.core.mp.base.BaseService;
public interface IEmTreeBasicService extends BaseService<EmTreeBasicEntity> {
public interface IEmTreeBasicService extends IService<EmTreeBasicEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java

@ -1,11 +1,12 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmTreeInspectEntity; import com.hnac.hzims.equipment.entity.EmTreeInspectEntity;
import org.springblade.core.mp.base.BaseService;
import java.util.List; import java.util.List;
public interface IEmTreeInspectService extends BaseService<EmTreeInspectEntity> { public interface IEmTreeInspectService extends IService<EmTreeInspectEntity> {
/** /**
* 获取 * 获取

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java

@ -1,7 +1,8 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.EmTreeParamEntity; import com.hnac.hzims.equipment.entity.EmTreeParamEntity;
import org.springblade.core.mp.base.BaseService;
public interface IEmTreeParamService extends BaseService<EmTreeParamEntity> {
public interface IEmTreeParamService extends IService<EmTreeParamEntity> {
} }

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java

@ -1,13 +1,14 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.dto.EmTreeDTO; import com.hnac.hzims.equipment.dto.EmTreeDTO;
import com.hnac.hzims.equipment.entity.EmTreeEntity; import com.hnac.hzims.equipment.entity.EmTreeEntity;
import com.hnac.hzims.equipment.vo.EmTreeVO; import com.hnac.hzims.equipment.vo.EmTreeVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List; import java.util.List;
public interface IEmTreeService extends BaseService<EmTreeEntity> { public interface IEmTreeService extends IService<EmTreeEntity> {
Boolean saveEmTrree(EmTreeDTO emTreeDTO); Boolean saveEmTrree(EmTreeDTO emTreeDTO);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java

@ -1,14 +1,15 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.dto.EmVideoBandingSaveDTO; import com.hnac.hzims.equipment.dto.EmVideoBandingSaveDTO;
import com.hnac.hzims.equipment.entity.EmVideoBandingEntity; import com.hnac.hzims.equipment.entity.EmVideoBandingEntity;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springblade.core.mp.base.BaseService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
public interface IEmVideoBandingService extends BaseService<EmVideoBandingEntity> { public interface IEmVideoBandingService extends IService<EmVideoBandingEntity> {
/** /**
* 设备绑定视频点位 * 设备绑定视频点位

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java

@ -1,16 +1,17 @@
package com.hnac.hzims.equipment.service; package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.entity.PlanGenerationEntity; import com.hnac.hzims.equipment.entity.PlanGenerationEntity;
import com.hnac.hzims.equipment.vo.PlanGenerationVo; import com.hnac.hzims.equipment.vo.PlanGenerationVo;
import com.hnac.hzims.equipment.vo.PlanPowerYearVo; import com.hnac.hzims.equipment.vo.PlanPowerYearVo;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public interface IPlanGenerationService extends BaseService<PlanGenerationEntity> { public interface IPlanGenerationService extends IService<PlanGenerationEntity> {
IPage<PlanGenerationVo> doPage(IPage<PlanGenerationEntity> page, PlanGenerationVo vo); IPage<PlanGenerationVo> doPage(IPage<PlanGenerationEntity> page, PlanGenerationVo vo);

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IWorkshopInfoService.java

@ -2,10 +2,11 @@ package com.hnac.hzims.equipment.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hnac.hzims.equipment.dto.WorkshopInfoDTO; import com.hnac.hzims.equipment.dto.WorkshopInfoDTO;
import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; import com.hnac.hzims.equipment.entity.WorkshopInfoEntity;
import com.hnac.hzims.equipment.vo.WorkShopInfoVO; import com.hnac.hzims.equipment.vo.WorkShopInfoVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.BeanUtil;
@ -14,7 +15,7 @@ import java.util.List;
/** /**
* @author hx * @author hx
*/ */
public interface IWorkshopInfoService extends BaseService<WorkshopInfoEntity> { public interface IWorkshopInfoService extends IService<WorkshopInfoEntity> {
/** /**
* 查询厂房列表 * 查询厂房列表

5
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java

@ -1,13 +1,14 @@
package com.hnac.hzims.equipment.service.impl; package com.hnac.hzims.equipment.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity; import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity;
import com.hnac.hzims.equipment.mapper.EmAssociationDetailMapper; import com.hnac.hzims.equipment.mapper.EmAssociationDetailMapper;
import com.hnac.hzims.equipment.service.IEmAssociationDetailService; import com.hnac.hzims.equipment.service.IEmAssociationDetailService;
import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class EmAssociationDetailServiceImpl extends BaseServiceImpl<EmAssociationDetailMapper, EmAssociationDetailEntity> implements IEmAssociationDetailService { public class EmAssociationDetailServiceImpl extends ServiceImpl<EmAssociationDetailMapper, EmAssociationDetailEntity> implements IEmAssociationDetailService {
//@Value("${url.updateFaultState_Auto}") //@Value("${url.updateFaultState_Auto}")

4
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationServiceImpl.java

@ -5,13 +5,13 @@ import com.hnac.hzims.equipment.mapper.EmAssociationMapper;
import com.hnac.hzims.equipment.service.IEmAssociationService; import com.hnac.hzims.equipment.service.IEmAssociationService;
import com.hnac.hzims.equipment.vo.EmAssociationVo; import com.hnac.hzims.equipment.vo.EmAssociationVo;
import org.springblade.core.mp.base.BaseServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class EmAssociationServiceImpl extends BaseServiceImpl<EmAssociationMapper, EmAssociationEntity> implements IEmAssociationService { public class EmAssociationServiceImpl extends ServiceImpl<EmAssociationMapper, EmAssociationEntity> implements IEmAssociationService {
@Autowired @Autowired
private EmAssociationMapper emAssociationMapper; private EmAssociationMapper emAssociationMapper;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save