diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java index 350ee77..c7870b9 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java @@ -28,13 +28,13 @@ public interface IQuestionClient { * @return */ @GetMapping(SUBMIT_STATION_INFO) - R submitStationInfo(@RequestParam Integer fdpStationType, - @RequestParam String stationCode, - @RequestParam(required = false) String stationDesc); + R submitStationInfo(@RequestParam("fdpStationType") Integer fdpStationType, + @RequestParam("stationCode") String stationCode, + @RequestParam("stationDesc") String stationDesc); @DeleteMapping(DELETE_STATION_INFO) - R deleteStationInfo(@RequestParam String stationId); + R deleteStationInfo(@RequestParam("stationId") String stationId); @DeleteMapping(DELETE_STATION_INFO) - R deleteStationAnswer(@RequestParam String stationId); + R deleteStationAnswer(@RequestParam("stationId") String stationId); } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java index d723454..d50a0e6 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java +++ b/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 billing(@RequestParam Long taskId); + R billing(@RequestParam("taskId") Long taskId); /** * 开始检修任务 @@ -41,7 +41,7 @@ public interface IAccessTaskClient extends ITaskClient startTask(@RequestParam Long taskId, @RequestParam String startTime); + R startTask(@RequestParam("taskId") Long taskId, @RequestParam("startTime") String startTime); /** * 完成检修任务 diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClientFallBack.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClientFallBack.java index 5c0aca1..32dfb51 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClientFallBack.java +++ b/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; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; + +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.station.entity.StationEntity; import org.springblade.core.tool.api.R; import org.springblade.system.user.entity.User; diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java index 30c0c84..a7ce04f 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java +++ b/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") @ApiOperation(value = "查看,下面列表再调用eventController.list", notes = "传入taskid") - R detail(@RequestParam Long id); + R detail(@RequestParam("id") Long id); /** @@ -54,7 +54,7 @@ public interface TaskFeignClient { @GetMapping(value = "/task/event/list") @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") - R> eventList(@RequestParam Long taskId, @SpringQueryMap Query query, + R> eventList(@RequestParam("taskId") Long taskId, @SpringQueryMap Query query, @SpringQueryMap BladeUser bladeUser); @@ -63,7 +63,7 @@ public interface TaskFeignClient { */ @GetMapping(value = "/task/getTaskById") @ApiOperation(value = "获取任务详情", notes = "传入taskId") - R> getTaskById(@RequestParam Long id); + R> getTaskById(@RequestParam("id") Long id); /** @@ -71,7 +71,7 @@ public interface TaskFeignClient { */ @GetMapping("task/getTaskListStatistics") @ApiOperation(value = "巡检计划统计", notes = "传入计划id") - R> getTaskListStatistics(@RequestParam String startTime, @RequestParam String endTime, - @RequestParam Long deptId); + R> getTaskListStatistics(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, + @RequestParam("deptId") Long deptId); } diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java index 1eaad35..9261314 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java +++ b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java @@ -44,7 +44,7 @@ public interface IMessageClient { R sendMessage(@RequestBody MessagePushRecordDto request); @GetMapping(GET_TEMPLATE_BY_ID) - R getMsgTemplateById(@RequestParam Long id); + R getMsgTemplateById(@RequestParam("id") Long id); @PostMapping(value = SEND_WX_MESSAGE,consumes = "application/json; charset=UTF-8") R sendWxMessage(@RequestBody WxMessageDTO request); diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/config/SmsConfigVO.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/config/SmsConfigVO.java index 1d56358..8f68a07 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/vo/config/SmsConfigVO.java +++ b/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 io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springblade.resource.entity.Sms; + import java.io.Serializable; diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java index 033f480..8a1a8e7 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/CheckCompanyFeignClient.java +++ b/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") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情", notes = "传入id") - R detail(@RequestParam Long id); + R detail(@RequestParam("id") Long id); } diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java index 3fd2923..986b0d5 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java +++ b/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.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * @Author WL @@ -29,7 +30,7 @@ public interface SafeEquipmentTrialFeignClient { @GetMapping("/safeEquimentTrial/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") - R> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ; + R> list( @RequestParam("safeEquipmentTrialDTO")SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ; } diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java index 1f00e52..f25e008 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeproductFeignClient.java +++ b/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}") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：month,status,createDept") - R> listconferenceScope(@PathVariable Long page, @PathVariable Long size, + R> listconferenceScope(@PathVariable("page") Long page, @PathVariable("size") Long size, @SpringQueryMap CheckMonthEntity req); @@ -43,7 +43,7 @@ public interface SafeproductFeignClient { @GetMapping("/checkMonth/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情", notes = "传入id") - R detail(@RequestParam Long id); + R detail(@RequestParam("id") Long id); diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java index e285ea9..83e0de0 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/feign/TicketFeignClient.java +++ b/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") @ApiOperation(value = "详情") - R detail(@RequestParam Long id); + R detail(@RequestParam("id") Long id); /** @@ -69,7 +69,7 @@ public interface TicketFeignClient { * 根据月份和区域查询工作票列表详情 */ @GetMapping("/workTicketInfo/workTicketListByMonthAndArea/{page}/{size}") - R> workTicketListByMonthAndArea(@PathVariable Long page, - @PathVariable Long size, + R> workTicketListByMonthAndArea(@PathVariable("page") Long page, + @PathVariable("size") Long size, @SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo); } diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java index ae992f7..725db6c 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java @@ -45,7 +45,7 @@ public interface ITicketInfoClient { * @return */ @GetMapping(UPDATE_UNDONE_STATUS) - R updateUndoneStatus(@RequestParam Long ticketId); + R updateUndoneStatus(@RequestParam("ticketId") Long ticketId); /** * 根据时间段获取工作票 @@ -54,7 +54,7 @@ public interface ITicketInfoClient { * @return */ @GetMapping(GET_WORK_TICKET_BY_TIME) - R> getWorkTicketByTime(@RequestParam String startDate, @RequestParam String endDate); + R> getWorkTicketByTime(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate); /** * 根据时间段获取操作票 @@ -63,10 +63,10 @@ public interface ITicketInfoClient { * @return */ @GetMapping(GET_OPERATE_TICKET_BY_TIME) - R> getOperateTicketByTime(@RequestParam String startDate, @RequestParam String endDate); + R> getOperateTicketByTime(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate); @GetMapping(GET_OPERATE_TICKET_INFO_BY_IDS) - R> getWorkTicketInfoById(@RequestParam List ticekeIds); + R> getWorkTicketInfoById(@RequestParam("ticekeIds") List ticekeIds); /** * 获取操作票的合格率 @@ -74,7 +74,7 @@ public interface ITicketInfoClient { * @return */ @GetMapping(GET_TICKET_PASS_BY_IDS) - R getTicketPassByIds(@RequestParam List ticekeIds); + R getTicketPassByIds(@RequestParam("ticekeIds") List ticekeIds); /*** * 根据时间段获取工作票变更负责人列表 * @param startDate @@ -82,7 +82,7 @@ public interface ITicketInfoClient { * @return */ @GetMapping(GET_WORK_TICKET_TRANSFER) - R> getWorkTicketTransfer(@RequestParam String startDate, @RequestParam String endDate); + R> getWorkTicketTransfer(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate); /** * 获取首页工作票统计结果 diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java index 3220643..dd5410b 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/IWorkTicketTemplateClient.java @@ -41,7 +41,7 @@ public interface IWorkTicketTemplateClient { * @return */ @GetMapping(GENERATE_TICKET_BY_TEMPLATE_ID) - R> generateTicketByTemplateId(@RequestParam Long templateId, @RequestParam String taskIds - ,@RequestParam String emCode,@RequestParam String emName,@RequestParam String taskName); + R> generateTicketByTemplateId(@RequestParam("templateId") Long templateId, @RequestParam("taskIds") String taskIds + ,@RequestParam("emCode") String emCode,@RequestParam("emName") String emName,@RequestParam("taskName") String taskName); } diff --git a/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java b/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java index 26cfdf4..82467db 100644 --- a/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java +++ b/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IHeWeatherWeatherClient.java @@ -39,7 +39,7 @@ public interface IHeWeatherWeatherClient { * @return */ @GetMapping(GET_WEATHER_NOW_WITH_CACHE) - R getWeatherNowWithCache(@RequestParam String location); + R getWeatherNowWithCache(@RequestParam("location") String location); /** * 根据location查询三日内天气 @@ -47,7 +47,7 @@ public interface IHeWeatherWeatherClient { * @return */ @GetMapping(GET_WEATHER_THREE_DAYS_WITH_CACHE) - R getWeather3dWithCache(@RequestParam String location); + R getWeather3dWithCache(@RequestParam("location") String location); /** * 根据location查询七日天气 @@ -55,7 +55,7 @@ public interface IHeWeatherWeatherClient { * @return */ @GetMapping(GET_WEATHER_SEVEN_DAYS_WITH_CACHE) - R getWeather7dWithCache(@RequestParam String location); + R getWeather7dWithCache(@RequestParam("location") String location); /** * 根据站点编码获取近七日的天气情况 @@ -63,7 +63,7 @@ public interface IHeWeatherWeatherClient { * @return 各站点七日内的天气情况 */ @GetMapping(GET_WEATHER_SEVEN_DAYS_BY_STATION_CODES) - R> getWeather7dByStationCodes(@RequestParam String stationCodes); + R> getWeather7dByStationCodes(@RequestParam("stationCodes") String stationCodes); /** * 根据站点编码获取实时的天气情况 @@ -71,7 +71,7 @@ public interface IHeWeatherWeatherClient { * @return 各站点实时的天气情况 */ @GetMapping(GET_WEATHER_NOW_BY_STATION_CODES) - R> getWeatherNowByStationCodes(@RequestParam String stationCodes); + R> getWeatherNowByStationCodes(@RequestParam("stationCodes") String stationCodes); /** * 统计某年份的站点（区域、集团）下的降雨量 @@ -92,5 +92,5 @@ public interface IHeWeatherWeatherClient { * @return */ @GetMapping(GET_WEATHER_NOW_STATION_CODE) - R>> getWeathersByStationCode(@RequestParam int days, @RequestParam String stationCode); + R>> getWeathersByStationCode(@RequestParam("days") int days, @RequestParam("stationCode") String stationCode); } diff --git a/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IRainfallClient.java b/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IRainfallClient.java index 1bd3fed..1ce17bf 100644 --- a/hzims-service-api/weather-api/src/main/java/com/hnac/hzims/hzimsweather/feign/IRainfallClient.java +++ b/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"; @GetMapping(GET_DURATION_RAIN_FALL) - R>> getDurationRainFall(@RequestParam String stationCode, @RequestParam String startDate, @RequestParam String endDate); + R>> getDurationRainFall(@RequestParam("stationCode") String stationCode, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java b/hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java index c3b096d..d96a1c8 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java +++ b/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"}) @MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"}) @EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) -@MapperScan("com.hnac.hzims.**.mapper.**") @EnableScheduling @ComponentScan(basePackages = {"com.hnac.hzims.*"}) public class AssetsApplication { diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java index 9db6aa5..c192bdd 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -70,7 +70,7 @@ public class SpAllocationController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_allocation") @@ -125,7 +125,7 @@ public class SpAllocationController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "调拨单逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java index 23fdefd..9a48d98 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -55,7 +55,7 @@ public class SpReceiveController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receive") @@ -109,7 +109,7 @@ public class SpReceiveController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "领用单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** * 完成流程 修改状态 diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java index 879873c..2ea4014 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java +++ b/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.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -58,7 +58,7 @@ public class SpReceivesController extends BladeController { /** * 分页 代码自定义代号 */ - // @ApiLog + // @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receives") @@ -112,7 +112,7 @@ public class SpReceivesController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "资产管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** * 完成流程 修改状态 diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java index 750610a..a3dac9d 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java +++ b/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") @Operate(label = "归还删除",type = BusinessType.DELETE,ignore = false) 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))); } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java index b5fa1ee..f25ec10 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -68,7 +68,7 @@ public class SpWarehouseInController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_warehouse_in") @@ -123,7 +123,7 @@ public class SpWarehouseInController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "入库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java index cbfa7ba..dfb6bd0 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java +++ b/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 lombok.AllArgsConstructor; 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.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -67,7 +67,7 @@ public class SpWarehouseOutController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_warehouse_out") @@ -83,7 +83,7 @@ public class SpWarehouseOutController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/exportList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_warehouse_out") @@ -173,7 +173,7 @@ public class SpWarehouseOutController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "出库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java index 55007eb..a796a88 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java +++ b/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 lombok.AllArgsConstructor; 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.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -104,7 +104,7 @@ public class WtSpBasicController extends BladeController { /** * 基础信息分页列表 */ - @ApiLog + @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入SP_BASIC") @@ -184,7 +184,7 @@ public class WtSpBasicController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "备品备件基础信息逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java index 0addd42..77d759d 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -80,7 +80,7 @@ public class WtSpManagementController extends BladeController { * @param managent * @return */ - @ApiLog + @GetMapping("/lazy-list") @ApiImplicitParams({ @ApiImplicitParam(name = "code", value = "备品备件分类编码", paramType = "query", dataType = "string"), @@ -176,7 +176,7 @@ public class WtSpManagementController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "备品备件分类删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java index 6b7c8bc..aece16c 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -61,7 +61,7 @@ public class WtSpProviderController extends BladeController { * 获取供应商列表 * @return */ - @ApiLog + @GetMapping("/getProviderList") @ApiOperationSupport(order = 2) @ApiOperation(value = "获取供应商列表") @@ -136,7 +136,7 @@ public class WtSpProviderController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "供应商删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java index 710504f..4a339e3 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -69,7 +69,7 @@ public class WtSpToolBasicController extends BladeController { /** * 工具台账分页列表 */ - @ApiLog + @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入toolBasicEntity") @@ -124,7 +124,7 @@ public class WtSpToolBasicController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "台账删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java index 36ba15c..d4612da 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -71,7 +71,7 @@ public class WtSpTotalController extends BladeController { /** * 库存分页列表 */ - @ApiLog + @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入spToolVO") @@ -140,7 +140,7 @@ public class WtSpTotalController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "备品备件库存删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java index 892a92f..3490a0a 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; import org.springblade.core.secure.BladeUser; @@ -59,7 +59,7 @@ public class WtSpWarehouseController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE") @@ -75,7 +75,7 @@ public class WtSpWarehouseController extends BladeController { * @param * @return */ - @ApiLog + @GetMapping("/selectOptionList") @ApiOperationSupport(order = 3) @ApiOperation(value = "仓库列表(下拉框)") @@ -143,7 +143,7 @@ public class WtSpWarehouseController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "仓库管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false) 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))); } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/scheduled/AssetsCreateTask.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/scheduled/AssetsCreateTask.java index f28dbd3..650ba82 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/scheduled/AssetsCreateTask.java +++ b/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.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; import lombok.AllArgsConstructor; 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.Func; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.Date; -import static com.hnac.hzims.spare.constants.ScheduledConstant.*; @Slf4j @@ -23,8 +18,6 @@ import static com.hnac.hzims.spare.constants.ScheduledConstant.*; public class AssetsCreateTask { private final IStockAlertService stockAlertService; - private final BladeLogger logger; - /** * 库存-告警 * @return ReturnT diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java index 1971eb0..45c91a5 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpAllocationService.java @@ -1,9 +1,9 @@ package com.hnac.hzims.spare.service; 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.vo.SpAllocationVO; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; /** @@ -11,7 +11,7 @@ import org.springblade.core.mp.support.Query; * * @author Chill */ -public interface ISpAllocationService extends BaseService { +public interface ISpAllocationService extends IService { /** * 分页列表 * @param allocationEntity diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java index b7d675f..8882b1a 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceiveService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.spare.service; 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.vo.SpReceiveVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; /** @@ -11,7 +12,7 @@ import org.springblade.core.mp.support.Query; * * @author Chill */ -public interface ISpReceiveService extends BaseService { +public interface ISpReceiveService extends IService { /** * 分页列表 * @param receiveEntity diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java index b4750f0..0a26898 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpReceivesService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.spare.service; 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.vo.SpReceivesVO; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface ISpReceivesService extends BaseService { +public interface ISpReceivesService extends IService { boolean updateStatu(SpReceivesEntity receiveEntity); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java index 78cc94b..d5eeea6 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRecordService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.spare.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.spare.entity.SpRecordEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface ISpRecordService extends BaseService { +public interface ISpRecordService extends IService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java index 65d1067..9d80b80 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpRevertService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.spare.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.spare.entity.SpRevertEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface ISpRevertService extends BaseService { +public interface ISpRevertService extends IService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java index 936778d..556e5d2 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpTicketRelationService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.spare.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.spare.entity.SpTicketRelationEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -11,6 +12,6 @@ import java.util.List; * * @author Chill */ -public interface ISpTicketRelationService extends BaseService { +public interface ISpTicketRelationService extends IService { void deleteSpTicketRelation(List list); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java index f18ea5d..d770930 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseInService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.spare.service; 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.vo.SpWarehouseInVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; /** @@ -11,7 +12,7 @@ import org.springblade.core.mp.support.Query; * * @author Chill */ -public interface ISpWarehouseInService extends BaseService { +public interface ISpWarehouseInService extends IService { /** * 分页列表 * @param warehouseInVO diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java index 3ac2520..c505b46 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.spare.service; 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.vo.SpWarehouseOutVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * * @author Chill */ -public interface ISpWarehouseOutService extends BaseService { +public interface ISpWarehouseOutService extends IService { /** * 分页列表 * @param warehouseOutEntity diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java index 0bf27a7..ac9faaf 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpBasicService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.spare.service; 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.SpTemporaryStockEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.vo.SparePartVO; 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.tool.api.R; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +21,7 @@ import java.util.Map; * * @author Chill */ -public interface IWtSpBasicService extends BaseService { +public interface IWtSpBasicService extends IService { /** * 基础信息列表 * @param SP_BASIC diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java index 4c868bc..4721d99 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpManagementService.java @@ -1,8 +1,9 @@ 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.vo.WtSpManagementVO; -import org.springblade.core.mp.base.BaseService; + import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -13,7 +14,7 @@ import java.util.Map; * * @author Chill */ -public interface IWtSpManagementService extends BaseService { +public interface IWtSpManagementService extends IService { /** * 新增 * @param entity diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java index 4d4e500..a6688f5 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpProviderService.java @@ -1,14 +1,14 @@ package com.hnac.hzims.spare.service; - +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.spare.entity.WtSpProviderEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface IWtSpProviderService extends BaseService { +public interface IWtSpProviderService extends IService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java index b9b6b4e..be1f326 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpToolBasicService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.spare.service; 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.vo.WtSpToolBasicVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * * @author Chill */ -public interface IWtSpToolBasicService extends BaseService { +public interface IWtSpToolBasicService extends IService { /** * 工具台账列表 * @param toolBasicEntity diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java index 1f37a27..1482da6 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpTotalService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.spare.service; 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.vo.StockVo; import com.hnac.hzims.spare.vo.WtSpToolVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; import java.util.Map; @@ -14,7 +15,7 @@ import java.util.Map; * * @author Chill */ -public interface IWtSpTotalService extends BaseService { +public interface IWtSpTotalService extends IService { /** * 新增预警 diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java index bde3b28..56eb6fb 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/IWtSpWarehouseService.java @@ -1,10 +1,10 @@ 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.hnac.hzims.spare.entity.WtSpWarehouseEntity; 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; @@ -13,7 +13,7 @@ import java.util.List; * * @author Chill */ -public interface IWtSpWarehouseService extends BaseService { +public interface IWtSpWarehouseService extends IService { /** diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java index 3a3bcb4..e161c7e 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java +++ b/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.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.chche.AssetsNumCache; import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.enume.BusinessType; @@ -15,7 +16,7 @@ import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -45,7 +46,7 @@ import java.util.Map; */ @Service @AllArgsConstructor -public class SpAllocationServiceImpl extends BaseServiceImpl implements ISpAllocationService { +public class SpAllocationServiceImpl extends ServiceImpl implements ISpAllocationService { private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java index 947c4a8..b3afb96 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java +++ b/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.metadata.IPage; 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.entity.*; import com.hnac.hzims.spare.enume.BusinessType; @@ -16,7 +17,7 @@ import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.Query; import org.springblade.core.secure.BladeUser; @@ -45,7 +46,7 @@ import java.util.Map; */ @Service @AllArgsConstructor -public class SpReceiveServiceImpl extends BaseServiceImpl implements ISpReceiveService { +public class SpReceiveServiceImpl extends ServiceImpl implements ISpReceiveService { private static final Logger logger = LoggerFactory.getLogger(SpAllocationServiceImpl.class); private ISpRecordService recordService; @@ -277,7 +278,7 @@ public class SpReceiveServiceImpl extends BaseServiceImpl list = spRecordMapper.selectList(params); 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 map = new HashMap<>(); map.put("spBasicId",list.get(i).getSpBasicId()); map.put("warehouseId",list.get(i).getWarehouseId()); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceivesServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceivesServiceImpl.java index daadbc9..340a571 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceivesServiceImpl.java +++ b/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.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.enume.BusinessType; 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.WtSpBasicVO; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.BladeUser; 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.feign.IUserClient; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; + + import java.util.*; @@ -36,7 +36,7 @@ import java.util.*; */ @Service @AllArgsConstructor -public class SpReceivesServiceImpl extends BaseServiceImpl implements ISpReceivesService { +public class SpReceivesServiceImpl extends ServiceImpl implements ISpReceivesService { private ISpRecordService recordService; private SpRecordMapper spRecordMapper; @@ -78,7 +78,7 @@ public class SpReceivesServiceImpl extends BaseServiceImpl list = spRecordMapper.selectList(params); // 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 map = new HashMap<>(); // map.put("spBasicId",list.get(i).getSpBasicId()); // map.put("warehouseId",list.get(i).getWarehouseId()); @@ -137,7 +137,7 @@ public class SpReceivesServiceImpl extends BaseServiceImpl list = spRecordMapper.selectList(params); 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 map = new HashMap<>(); map.put("spBasicId",list.get(i).getSpBasicId()); map.put("warehouseId",list.get(i).getWarehouseId()); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRecordServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRecordServiceImpl.java index 9360cd0..6faf807 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRecordServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.SpRecordEntity; import com.hnac.hzims.spare.mapper.SpRecordMapper; import com.hnac.hzims.spare.service.ISpRecordService; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; /** @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class SpRecordServiceImpl extends BaseServiceImpl implements ISpRecordService { +public class SpRecordServiceImpl extends ServiceImpl implements ISpRecordService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRevertServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRevertServiceImpl.java index 0a1b286..ce86e2c 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpRevertServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.SpRevertEntity; import com.hnac.hzims.spare.mapper.SpRevertMapper; import com.hnac.hzims.spare.service.ISpRevertService; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; */ @Service @AllArgsConstructor -public class SpRevertServiceImpl extends BaseServiceImpl implements ISpRevertService { +public class SpRevertServiceImpl extends ServiceImpl implements ISpRevertService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpTicketRelationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpTicketRelationServiceImpl.java index 2be3ade..5627237 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpTicketRelationServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.SpTicketRelationEntity; import com.hnac.hzims.spare.mapper.SpTicketRelationMapper; import com.hnac.hzims.spare.service.ISpTicketRelationService; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * @author Chill */ @Service -public class SpTicketRelationServiceImpl extends BaseServiceImpl implements ISpTicketRelationService { +public class SpTicketRelationServiceImpl extends ServiceImpl implements ISpTicketRelationService { @Override public void deleteSpTicketRelation(List list) { diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java index bacd02c..057887e 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java +++ b/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.metadata.IPage; 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.entity.*; import com.hnac.hzims.spare.enume.BusinessType; @@ -17,26 +18,19 @@ import com.hnac.hzims.spare.vo.WtSpManagementVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springblade.core.launch.constant.FlowConstant; 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.Query; import org.springblade.core.secure.utils.AuthUtil; 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.feign.IDictBizClient; 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.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -52,7 +46,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class SpWarehouseInServiceImpl extends BaseServiceImpl implements ISpWarehouseInService { +public class SpWarehouseInServiceImpl extends ServiceImpl implements ISpWarehouseInService { private static final Logger logger = LoggerFactory.getLogger(SpWarehouseInServiceImpl.class); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java index 9e5e594..b34560f 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java +++ b/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.toolkit.Wrappers; 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.entity.*; import com.hnac.hzims.spare.enume.BusinessType; @@ -18,7 +19,6 @@ import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -44,7 +44,7 @@ import java.util.*; */ @Service @AllArgsConstructor -public class SpWarehouseOutServiceImpl extends BaseServiceImpl implements ISpWarehouseOutService { +public class SpWarehouseOutServiceImpl extends ServiceImpl implements ISpWarehouseOutService { private static final Logger logger = LoggerFactory.getLogger(SpWarehouseOutServiceImpl.class); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java index b1af6c9..f97b662 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java +++ b/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 com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; 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.toolkit.Wrappers; 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.spare.entity.*; 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 lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springblade.core.excel.support.ExcelException; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -59,7 +57,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import javax.xml.ws.WebServiceException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -79,7 +76,7 @@ import static com.hnac.hzims.spare.utils.ExcelUtil.asyncReadModel; @Slf4j @Service @AllArgsConstructor -public class WtSpBasicServiceImpl extends BaseServiceImpl implements IWtSpBasicService { +public class WtSpBasicServiceImpl extends ServiceImpl implements IWtSpBasicService { private static final Logger LOGGER = LoggerFactory.getLogger(WtSpBasicServiceImpl.class); private WtSpManagementMapper managementMapper; @@ -520,7 +517,7 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl implements IWtSpManagementService { +public class WtSpManagementServiceImpl extends ServiceImpl implements IWtSpManagementService { private WtSpManagementMapper wtSpManagementMapper; diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpProviderServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpProviderServiceImpl.java index 929e880..48284db 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpProviderServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.WtSpProviderEntity; import com.hnac.hzims.spare.mapper.WtSpProviderMapper; import com.hnac.hzims.spare.service.IWtSpProviderService; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; */ @Service @AllArgsConstructor -public class WtSpProviderServiceImpl extends BaseServiceImpl implements IWtSpProviderService { +public class WtSpProviderServiceImpl extends ServiceImpl implements IWtSpProviderService { } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java index 4cc8900..6c91a9c 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java +++ b/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.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.*; import com.hnac.hzims.spare.enume.BusinessType; 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.vo.WtSpToolBasicVO; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -32,7 +32,7 @@ import java.util.Map; */ @Service @AllArgsConstructor -public class WtSpToolBasicServiceImpl extends BaseServiceImpl implements IWtSpToolBasicService { +public class WtSpToolBasicServiceImpl extends ServiceImpl implements IWtSpToolBasicService { private IWtSpBasicService spBasicService; diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpTotalServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpTotalServiceImpl.java index f934716..8651697 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpTotalServiceImpl.java +++ b/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.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.entity.WtSpManagementEntity; 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 lombok.AllArgsConstructor; 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.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -35,7 +35,7 @@ import java.util.Map; */ @Service @AllArgsConstructor -public class WtSpTotalServiceImpl extends BaseServiceImpl implements IWtSpTotalService { +public class WtSpTotalServiceImpl extends ServiceImpl implements IWtSpTotalService { private IWtSpWarehouseService wtSpWarehouseService; diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java index 7d83a40..ef265a3 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java +++ b/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.metadata.IPage; 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.mapper.WtSpWarehouseMapper; import com.hnac.hzims.spare.service.IWtSpWarehouseService; @@ -11,10 +12,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; 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.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.entity.Dept; @@ -35,7 +34,7 @@ import java.util.List; @Slf4j @Service @AllArgsConstructor -public class WtSpWarehouseServiceImpl extends BaseServiceImpl implements IWtSpWarehouseService { +public class WtSpWarehouseServiceImpl extends ServiceImpl implements IWtSpWarehouseService { private ISysClient sysClient; diff --git a/hzims-service/assets/src/main/resources/application-dev.yml b/hzims-service/assets/src/main/resources/application-dev.yml deleted file mode 100644 index ffdfd7e..0000000 --- a/hzims-service/assets/src/main/resources/application-dev.yml +++ /dev/null @@ -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 diff --git a/hzims-service/assets/src/main/resources/application-prod.yml b/hzims-service/assets/src/main/resources/application-prod.yml deleted file mode 100644 index da89262..0000000 --- a/hzims-service/assets/src/main/resources/application-prod.yml +++ /dev/null @@ -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} diff --git a/hzims-service/assets/src/main/resources/application-test.yml b/hzims-service/assets/src/main/resources/application-test.yml deleted file mode 100644 index 4b4e157..0000000 --- a/hzims-service/assets/src/main/resources/application-test.yml +++ /dev/null @@ -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} diff --git a/hzims-service/assets/src/main/resources/application.yml b/hzims-service/assets/src/main/resources/application.yml deleted file mode 100644 index ae1c9a6..0000000 --- a/hzims-service/assets/src/main/resources/application.yml +++ /dev/null @@ -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 - - - diff --git a/hzims-service/assets/src/main/resources/template/template.yml b/hzims-service/assets/src/main/resources/template/template.yml new file mode 100644 index 0000000..f293626 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index 107fb68..ccb295e 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -47,7 +47,7 @@ com.baomidou dynamic-datasource-spring-boot-starter - 2.5.6 + 3.5.0 cn.hutool diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java index 84c949a..483e6eb 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java +++ b/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.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; @@ -30,21 +32,23 @@ import org.springframework.scheduling.annotation.EnableScheduling; * * @author Chill */ -@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) + +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") +@MapperScan("com.hnac.hzims.**.mapper") @EnableScheduling @ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class EquipmentApplication extends SpringBootServletInitializer { +public class EquipmentApplication { public static void main(String[] args) { BladeApplication.run(EquipmentConstants.APP_NAME, EquipmentApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, EquipmentConstants.APP_NAME, EquipmentApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, EquipmentConstants.APP_NAME, EquipmentApplication.class); +// } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java index 70a5081..3dd9a14 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsDetailService.java @@ -1,12 +1,13 @@ 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 org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface IParamBackupsDetailService extends BaseService { +public interface IParamBackupsDetailService extends IService { List getBackupsParamTree(Long backupsId); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java index 787b06e..69bcd93 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamBackupsService.java @@ -1,18 +1,19 @@ package com.hnac.hzims.emParam.service; 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.emParam.dto.ParamBackupsDTO; import com.hnac.hzims.emParam.entity.ParamBackupsEntity; import com.hnac.hzims.emParam.vo.ParamBackupsVO; 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.Func; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -public interface IParamBackupsService extends BaseService { +public interface IParamBackupsService extends IService { Boolean save(ParamBackupsDTO request); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java index 0252723..d23f9e0 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/IParamModelService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.emParam.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.emParam.entity.ParamModelEntity; -import org.springblade.core.mp.base.BaseService; -public interface IParamModelService extends BaseService { + +public interface IParamModelService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsDetailServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsDetailServiceImpl.java index 18fbffa..878d881 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsDetailServiceImpl.java +++ b/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.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.hnac.hzims.emParam.entity.ParamBackupsDetailEntity; 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 lombok.AllArgsConstructor; 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.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class ParamBackupsDetailServiceImpl extends BaseServiceImpl implements IParamBackupsDetailService { +public class ParamBackupsDetailServiceImpl extends ServiceImpl implements IParamBackupsDetailService { @Override diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsServiceImpl.java index b9e8f0b..08eda6a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamBackupsServiceImpl.java +++ b/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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.entity.ParamBackupsDetailEntity; 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.extern.slf4j.Slf4j; 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.tool.utils.BeanUtil; 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.util.Assert; +import javax.annotation.Resource; import javax.sql.rowset.serial.SerialException; import java.util.HashMap; import java.util.List; @@ -41,11 +41,11 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class ParamBackupsServiceImpl extends BaseServiceImpl implements IParamBackupsService { +public class ParamBackupsServiceImpl extends ServiceImpl implements IParamBackupsService { + private final IParamBackupsDetailService detailService; private final ControlClient controlClient; - private final BladeLogger logger; @Override @Transactional @@ -118,7 +118,7 @@ public class ParamBackupsServiceImpl extends BaseServiceImpl result = controlClient.batchSendToDevice(controlBatchDTO); 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()); } }); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamModelServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamModelServiceImpl.java index 0b38863..1f4c5c0 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamModelServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.emParam.entity.ParamModelEntity; import com.hnac.hzims.emParam.mapper.ParamModelMapper; import com.hnac.hzims.emParam.service.IParamModelService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.base.BaseServiceImpl; + + import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j -public class ParamModelServiceImpl extends BaseServiceImpl implements IParamModelService { +public class ParamModelServiceImpl extends ServiceImpl implements IParamModelService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamServiceImpl.java index ffd108b..905a6ed 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/service/impl/ParamServiceImpl.java +++ b/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.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.*; @@ -55,7 +54,6 @@ public class ParamServiceImpl implements IParamService { private final ControlClient controlClient; private final DeviceClient deviceClient; private final RedisClient redisClient; - private final BladeLogger logger; private final IEmInfoService emInfoService; private final DeviceDataClient deviceDataClient; private final IAnalyseDataSearchClient analyseDataSearchClient; @@ -134,7 +132,7 @@ public class ParamServiceImpl implements IParamService { log.info("{}",JSON.toJSONString(controlBatchDTO)); Result result = controlClient.batchSendToDevice(controlBatchDTO); 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; } LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate().set(EmInfoEntity::getLastDistributeTime, LocalDateTime.now()).eq(EmInfoEntity::getNumber, req.getEmCode()); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java index cb14b0e..5fa240e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationController.java @@ -73,7 +73,7 @@ public class EmAssociationController extends BladeController { @DeleteMapping() @ApiOperation(value = "删除") public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){ - return R.status(emAssociationService.deleteLogic(Func.toLongList(ids))); + return R.status(emAssociationService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java index 5d7efca..466587a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAssociationDetailController.java @@ -75,7 +75,7 @@ public class EmAssociationDetailController extends BladeController { @DeleteMapping() @ApiOperation(value = "删除") public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){ - return R.status(emAssociationDetailService.deleteLogic(Func.toLongList(ids))); + return R.status(emAssociationDetailService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAttachController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAttachController.java index 35b71e4..64f3e6a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmAttachController.java +++ b/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) @ApiOperation(value = "逻辑删除", notes = "传入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))); } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java index 30f817f..8b81ad8 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java +++ b/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 lombok.AllArgsConstructor; 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.Query; 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}) @ApiOperationSupport(order = 3) @ApiOperation(value = "设备分页", notes = "传入em_info") @@ -117,7 +117,7 @@ public class EmInfoController extends BladeController { /** * 查看子设备列表 分页(树结构) */ - @ApiLog + @RequestMapping(value = "/treeList") @ApiOperationSupport(order = 3) @ApiOperation(value = "查看子设备列表 分页(树结构)", notes = "传入设备id") @@ -186,7 +186,7 @@ public class EmInfoController extends BladeController { * @param name 设备名称 * @return */ - @ApiLog + @RequestMapping(value = "/getEmInfoTreeList") @ApiOperationSupport(order = 3) @ApiOperation(value = "获取所有设备列表(树结构)", notes = "传入设备id") @@ -400,7 +400,7 @@ public class EmInfoController extends BladeController { /** * 获取设备的备品备件 */ - @ApiLog + @GetMapping("/getSparePart") @ApiOperationSupport(order = 10) @ApiOperation(value = "获取设备的备品备件") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelController.java index 5bef5cf..bc7e1cc 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelController.java +++ b/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) @ApiOperation(value = "逻辑删除", notes = "传入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))); } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelParamController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelParamController.java index 527d27c..61d136b 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmModelParamController.java +++ b/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) @ApiOperation(value = "逻辑删除", notes = "传入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))); } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmOreanizationController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmOreanizationController.java index 9369003..55f67ce 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmOreanizationController.java +++ b/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))); } /** diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmParamController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmParamController.java index d162be7..c109244 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmParamController.java +++ b/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) @ApiOperation(value = "逻辑删除", notes = "传入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); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java index e09fba1..8dd289a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/PlanGenertionController.java +++ b/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.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -49,7 +49,7 @@ public class PlanGenertionController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @OperationAnnotation(moduleName = "数据填报",title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType = @@ -89,7 +89,7 @@ public class PlanGenertionController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入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))); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java index 146866a..eeb04d0 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java @@ -1,20 +1,8 @@ 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.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.ApiOperation; 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.RestController; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java index 3f051f6..ab45d27 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/WorkshopInfoController.java +++ b/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.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.service.IEmParamService; 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.ApiOperation; import lombok.AllArgsConstructor; -import org.apiguardian.api.API; 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.Query; import org.springblade.core.tool.api.R; @@ -59,7 +55,7 @@ public class WorkshopInfoController extends BladeController { return R.success("更新成功"); } - @ApiLog + @RequestMapping(value = "/listPage",method = RequestMethod.GET) @ApiOperation("列表分页查询") @ApiOperationSupport(order = 3) @@ -78,7 +74,7 @@ public class WorkshopInfoController extends BladeController { @ApiOperation("厂房删除") @ApiOperationSupport(order = 5) public R 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) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/WorkshopInfoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/WorkshopInfoClient.java index bf44045..05868e6 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/WorkshopInfoClient.java +++ b/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 groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; -import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java index c3cf9a5..c88ce9d 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationDetailService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.equipment.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.Map; -public interface IEmAssociationDetailService extends BaseService { +public interface IEmAssociationDetailService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java index 95b7a7e..0e17500 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAssociationService.java @@ -1,11 +1,12 @@ 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.vo.EmAssociationVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; -public interface IEmAssociationService extends BaseService { +public interface IEmAssociationService extends IService { R insert(EmAssociationVo emAssociationVo); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java index cbc8143..7bfa147 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmAttachService.java @@ -1,6 +1,7 @@ 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; /** @@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmAttachEntity; * * @author Chill */ -public interface IEmAttachService extends BaseService { +public interface IEmAttachService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java index 21e7128..411cc20 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmDefinitionService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.equipment.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmDefinitionEntity; -import org.springblade.core.mp.base.BaseService; -public interface IEmDefinitionService extends BaseService { + +public interface IEmDefinitionService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java index 5632b61..d22f541 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.equipment.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.dto.DeviceTreeDTO; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.vo.*; import com.hnac.hzims.spare.vo.SparePartVO; 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.system.vo.CreateTableVO; @@ -19,7 +20,7 @@ import java.util.Map; * * @author Chill */ -public interface IEmInfoService extends BaseService { +public interface IEmInfoService extends IService { String PUBLIC_TYPE = "1"; String SET_TYPE = "2"; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java index e4afb1d..0df3184 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelParamService.java @@ -1,6 +1,7 @@ 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; /** @@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmModelParamEntity; * * @author Chill */ -public interface IEmModelParamService extends BaseService { +public interface IEmModelParamService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java index a244721..24858a4 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmModelService.java @@ -1,6 +1,7 @@ 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; /** @@ -8,6 +9,6 @@ import com.hnac.hzims.equipment.entity.EmModelEntity; * * @author Chill */ -public interface IEmModelService extends BaseService { +public interface IEmModelService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java index 1d7d458..76a8bf4 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmOreanizationService.java @@ -1,8 +1,9 @@ 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.vo.EmOreanizationVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.equipment.entity.EmOreanizationEntity; import org.springblade.core.tool.api.R; import org.springblade.core.tool.node.INode; @@ -16,7 +17,7 @@ import java.util.List; * * @author moze */ -public interface IEmOreanizationService extends BaseService { +public interface IEmOreanizationService extends IService { List initLoad(String tenantId); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java index ca087ff..f0fa395 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmParamService.java @@ -1,6 +1,7 @@ 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 java.util.List; @@ -11,7 +12,7 @@ import java.util.Map; * * @author Chill */ -public interface IEmParamService extends BaseService { +public interface IEmParamService extends IService { Integer getInstalledCapacityCountByDepts(List depts); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java index 1202a99..01e07f0 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeBasicService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.equipment.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmTreeBasicEntity; -import org.springblade.core.mp.base.BaseService; -public interface IEmTreeBasicService extends BaseService { + +public interface IEmTreeBasicService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java index a5c4975..5f4798e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeInspectService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.equipment.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmTreeInspectEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface IEmTreeInspectService extends BaseService { +public interface IEmTreeInspectService extends IService { /** * 获取 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java index 7a57110..8067527 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeParamService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.equipment.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmTreeParamEntity; -import org.springblade.core.mp.base.BaseService; -public interface IEmTreeParamService extends BaseService { + +public interface IEmTreeParamService extends IService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java index 97a17eb..a3ce575 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmTreeService.java @@ -1,13 +1,14 @@ 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.entity.EmTreeEntity; import com.hnac.hzims.equipment.vo.EmTreeVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface IEmTreeService extends BaseService { +public interface IEmTreeService extends IService { Boolean saveEmTrree(EmTreeDTO emTreeDTO); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java index 3522ab7..e511d2f 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmVideoBandingService.java @@ -1,14 +1,15 @@ 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.entity.EmVideoBandingEntity; import io.swagger.annotations.ApiParam; -import org.springblade.core.mp.base.BaseService; + import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -public interface IEmVideoBandingService extends BaseService { +public interface IEmVideoBandingService extends IService { /** * 设备绑定视频点位 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java index f7e6d65..59c3be4 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IPlanGenerationService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.equipment.service; 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.vo.PlanGenerationVo; import com.hnac.hzims.equipment.vo.PlanPowerYearVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; -public interface IPlanGenerationService extends BaseService { +public interface IPlanGenerationService extends IService { IPage doPage(IPage page, PlanGenerationVo vo); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IWorkshopInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IWorkshopInfoService.java index eec1aa3..60cf782 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IWorkshopInfoService.java +++ b/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.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.dto.WorkshopInfoDTO; import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; 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.tool.utils.BeanUtil; @@ -14,7 +15,7 @@ import java.util.List; /** * @author hx */ -public interface IWorkshopInfoService extends BaseService { +public interface IWorkshopInfoService extends IService { /** * 查询厂房列表 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java index 76e6307..b26dfea 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java +++ b/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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.equipment.entity.EmAssociationDetailEntity; import com.hnac.hzims.equipment.mapper.EmAssociationDetailMapper; 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; @Service -public class EmAssociationDetailServiceImpl extends BaseServiceImpl implements IEmAssociationDetailService { +public class EmAssociationDetailServiceImpl extends ServiceImpl implements IEmAssociationDetailService { //@Value("${url.updateFaultState_Auto}") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationServiceImpl.java index a6db517..c96daf5 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationServiceImpl.java +++ b/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.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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class EmAssociationServiceImpl extends BaseServiceImpl implements IEmAssociationService { +public class EmAssociationServiceImpl extends ServiceImpl implements IEmAssociationService { @Autowired private EmAssociationMapper emAssociationMapper; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAttachServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAttachServiceImpl.java index 5a8670f..d80113c 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAttachServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAttachServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.equipment.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.equipment.entity.EmAttachEntity; import com.hnac.hzims.equipment.mapper.EmAttachMapper; import com.hnac.hzims.equipment.service.IEmAttachService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class EmAttachServiceImpl extends BaseServiceImpl implements IEmAttachService { +public class EmAttachServiceImpl extends ServiceImpl implements IEmAttachService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmDefinitionServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmDefinitionServiceImpl.java index 576d567..0dd6593 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmDefinitionServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmDefinitionServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.equipment.entity.EmDefinitionEntity; import com.hnac.hzims.equipment.mapper.EmDefinitionMapper; import com.hnac.hzims.equipment.service.IEmDefinitionService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class EmDefinitionServiceImpl extends BaseServiceImpl implements IEmDefinitionService { +public class EmDefinitionServiceImpl extends ServiceImpl implements IEmDefinitionService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java index 75d0db5..2ec2807 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java @@ -45,7 +45,7 @@ import com.hnac.hzinfo.sdk.v5.device.vo.DeviceChildrenVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -76,7 +76,7 @@ import java.util.stream.Stream; */ @Service @Slf4j -public class EmInfoServiceImpl extends BaseServiceImpl implements IEmInfoService { +public class EmInfoServiceImpl extends ServiceImpl implements IEmInfoService { @Autowired private IEmParamService paramService; @Autowired @@ -480,7 +480,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl implements IEmModelParamService { +public class EmModelParamServiceImpl extends ServiceImpl implements IEmModelParamService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmModelServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmModelServiceImpl.java index fc0ff21..9681c0d 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmModelServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmModelServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.equipment.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.equipment.entity.EmModelEntity; import com.hnac.hzims.equipment.mapper.EmModelMapper; import com.hnac.hzims.equipment.service.IEmModelService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class EmModelServiceImpl extends BaseServiceImpl implements IEmModelService { +public class EmModelServiceImpl extends ServiceImpl implements IEmModelService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmOreanizationServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmOreanizationServiceImpl.java index 45f9291..f4c8a1a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmOreanizationServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmOreanizationServiceImpl.java @@ -2,7 +2,7 @@ package com.hnac.hzims.equipment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hnac.hzims.equipment.entity.EmTreeNode; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.equipment.entity.EmOreanizationEntity; import com.hnac.hzims.equipment.mapper.EmOreanizationMapper; import com.hnac.hzims.equipment.service.IEmOreanizationService; @@ -25,7 +25,7 @@ import java.util.Objects; * @author Chill */ @Service -public class EmOreanizationServiceImpl extends BaseServiceImpl implements IEmOreanizationService { +public class EmOreanizationServiceImpl extends ServiceImpl implements IEmOreanizationService { @Autowired private EmOreanizationMapper oreanizationMapper; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmParamServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmParamServiceImpl.java index cd4f0c6..c364e79 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmParamServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmParamServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.equipment.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.equipment.entity.EmParamEntity; import com.hnac.hzims.equipment.mapper.EmParamMapper; import com.hnac.hzims.equipment.service.IEmParamService; @@ -18,7 +18,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class EmParamServiceImpl extends BaseServiceImpl implements IEmParamService { +public class EmParamServiceImpl extends ServiceImpl implements IEmParamService { /** * 根据Dept 获取 装机容量 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeBasicServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeBasicServiceImpl.java index d7197db..0707d5b 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeBasicServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeBasicServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.equipment.mapper.EmTreeInspectMapper; import com.hnac.hzims.equipment.service.IEmTreeBasicService; import com.hnac.hzims.equipment.service.IEmTreeInspectService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class EmTreeBasicServiceImpl extends BaseServiceImpl implements IEmTreeBasicService { +public class EmTreeBasicServiceImpl extends ServiceImpl implements IEmTreeBasicService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeInspectServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeInspectServiceImpl.java index ebcd9c3..bf594a1 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeInspectServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeInspectServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.equipment.entity.EmTreeInspectEntity; import com.hnac.hzims.equipment.mapper.EmTreeInspectMapper; import com.hnac.hzims.equipment.service.IEmTreeInspectService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; */ @Service @Slf4j -public class EmTreeInspectServiceImpl extends BaseServiceImpl implements IEmTreeInspectService { +public class EmTreeInspectServiceImpl extends ServiceImpl implements IEmTreeInspectService { @Override public List selectEmTreeContentId() { diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeParamServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeParamServiceImpl.java index 83ea058..4485597 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeParamServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeParamServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.equipment.entity.EmTreeParamEntity; import com.hnac.hzims.equipment.mapper.EmTreeParamMapper; import com.hnac.hzims.equipment.service.IEmTreeParamService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -13,5 +13,5 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class EmTreeParamServiceImpl extends BaseServiceImpl implements IEmTreeParamService { +public class EmTreeParamServiceImpl extends ServiceImpl implements IEmTreeParamService { } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeServiceImpl.java index 5f05da2..7445f06 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmTreeServiceImpl.java @@ -15,7 +15,7 @@ import com.hnac.hzims.equipment.service.IEmTreeParamService; import com.hnac.hzims.equipment.service.IEmTreeService; import lombok.extern.slf4j.Slf4j; 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.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class EmTreeServiceImpl extends BaseServiceImpl implements IEmTreeService { +public class EmTreeServiceImpl extends ServiceImpl implements IEmTreeService { @Autowired private IEmTreeInspectService emTreeInspectService; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmVideoBandingServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmVideoBandingServiceImpl.java index bdc92f5..b89f088 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmVideoBandingServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmVideoBandingServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.equipment.mapper.EmVideoBandingMapper; import com.hnac.hzims.equipment.service.IEmVideoBandingService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.tool.utils.BeanUtil; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class EmVideoBandingServiceImpl extends BaseServiceImpl implements IEmVideoBandingService { +public class EmVideoBandingServiceImpl extends ServiceImpl implements IEmVideoBandingService { @Override @Transactional diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EquipmentUpdateDeptIdServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EquipmentUpdateDeptIdServiceImpl.java index 60e8ee1..e905d4e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EquipmentUpdateDeptIdServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EquipmentUpdateDeptIdServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.mapper.UpdateDeptIdMapper; import com.hnac.hzims.equipment.service.IUpdateDeptIdService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/PlanGenerationServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/PlanGenerationServiceImpl.java index c515ca8..5e548ed 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/PlanGenerationServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/PlanGenerationServiceImpl.java @@ -22,7 +22,7 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; import lombok.AllArgsConstructor; 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.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class PlanGenerationServiceImpl extends BaseServiceImpl implements IPlanGenerationService { +public class PlanGenerationServiceImpl extends ServiceImpl implements IPlanGenerationService { private final IEmInfoService emInfoService; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/UpdateDeptIdServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/UpdateDeptIdServiceImpl.java index 6b38ea7..d3c4efd 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/UpdateDeptIdServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/UpdateDeptIdServiceImpl.java @@ -1,6 +1,7 @@ package com.hnac.hzims.equipment.service.impl; import com.google.common.base.Joiner; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.mapper.UpdateDeptIdMapper; import com.hnac.hzims.equipment.service.IUpdateDeptIdService; @@ -8,13 +9,12 @@ import com.hnac.hzims.equipment.vo.DataMappingVo; import com.hnac.hzims.equipment.vo.UpdateDeptIdByTenantIdVO; import com.hnac.hzims.equipment.vo.UpdateDeptVo; import com.hnac.hzims.equipment.vo.UpdateTenantVo; -import org.apache.commons.lang.StringUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.*; -public class UpdateDeptIdServiceImpl extends BaseServiceImpl implements IUpdateDeptIdService { +public class UpdateDeptIdServiceImpl extends ServiceImpl implements IUpdateDeptIdService { @Override @Transactional(rollbackFor = Exception.class) public boolean updateDeptId(UpdateDeptVo updateDeptVo) { diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/WorkshopInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/WorkshopInfoServiceImpl.java index c7afee5..8d27ef9 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/WorkshopInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/WorkshopInfoServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.equipment.vo.WorkShopInfoVO; import com.hnac.hzims.equipment.wrapper.WorkshopInfoWrapper; import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; -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.tool.utils.BeanUtil; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class WorkshopInfoServiceImpl extends BaseServiceImpl implements IWorkshopInfoService { +public class WorkshopInfoServiceImpl extends ServiceImpl implements IWorkshopInfoService { private final IEmParamService emParamService; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java index 953715e..04b1509 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java @@ -45,7 +45,7 @@ public class FdpDeviceController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDiagnoseController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDiagnoseController.java index 686c87c..eaa43e2 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDiagnoseController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDiagnoseController.java @@ -1,6 +1,7 @@ package com.hnac.hzims.fdp.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.fdp.dto.StatisticStatusDTO; import com.hnac.hzims.fdp.proxy.IDiagnoseProxy; import com.hnac.hzims.fdp.request.DiagnoseFaultAllReq; @@ -12,7 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang.StringUtils; + import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java index 7ba1710..2d19ae8 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpFaultController.java @@ -15,9 +15,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import oracle.jdbc.proxy.annotation.Post; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -49,7 +48,7 @@ public class FdpFaultController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -99,7 +98,7 @@ public class FdpFaultController extends BladeController { * @param query * @return */ - @ApiLog + @GetMapping("/queryFaultListOrd") @ApiOperationSupport(order = 60) @OperationAnnotation(moduleName = "智能诊断",title = "智能诊断",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE, diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpHistoryDataController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpHistoryDataController.java index ce5abfd..1dca644 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpHistoryDataController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpHistoryDataController.java @@ -23,7 +23,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -54,7 +54,7 @@ public class FdpHistoryDataController extends BladeController { /** * 分页 */ - @ApiLog + @PostMapping("/listPage") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction") @@ -69,7 +69,7 @@ public class FdpHistoryDataController extends BladeController { /** * 分页 */ - @ApiLog + @PostMapping("/updateFaultHistory") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpListTableDataController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpListTableDataController.java index 0f3b654..335fa8d 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpListTableDataController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpListTableDataController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -34,7 +34,7 @@ public class FdpListTableDataController extends BladeController { /** * 下拉列表页 */ - @ApiLog + @GetMapping("/getProperty") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction") @@ -48,7 +48,7 @@ public class FdpListTableDataController extends BladeController { /** * 分页查询智能诊断任务列表 */ - @ApiLog + @PostMapping ("/getListByProperty") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java index 9defa4c..69e7701 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java @@ -23,7 +23,7 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; import io.swagger.annotations.*; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -57,7 +57,7 @@ public class FdpMonitorController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -147,7 +147,7 @@ public class FdpMonitorController extends BladeController { /** * 查询列表树 */ - @ApiLog + @GetMapping("/listPage") @ApiOperationSupport(order = 110) @ApiOperation(value = "查询监测点列表") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java index db4ab11..bcbbb0c 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpTaskController.java @@ -19,7 +19,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -51,7 +51,7 @@ public class FdpTaskController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -87,7 +87,7 @@ public class FdpTaskController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/FdpDeviceCreateTask.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/FdpDeviceCreateTask.java index 65634c0..91b5897 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/FdpDeviceCreateTask.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/FdpDeviceCreateTask.java @@ -496,7 +496,7 @@ public class FdpDeviceCreateTask { } } if (CollectionUtil.isNotEmpty(ids)) { - fdpDeviceService.deleteLogic(ids); + fdpDeviceService.removeByIds(ids); } } @@ -541,7 +541,7 @@ public class FdpDeviceCreateTask { } } if (CollectionUtil.isNotEmpty(ids)) { - fdpDeviceService.deleteLogic(ids); + fdpDeviceService.removeByIds(ids); } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpDeviceService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpDeviceService.java index cb8fa1c..2b4782e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpDeviceService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpDeviceService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.fdp.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmTreeNode; import com.hnac.hzims.fdp.dto.FdpDeviceDTO; import com.hnac.hzims.fdp.entity.FdpDeviceEntity; import com.hnac.hzims.fdp.vo.FdpDeviceVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.List; * @author xiashandong * @created 2021-05-25 17:32 **/ -public interface IFdpDeviceService extends BaseService { +public interface IFdpDeviceService extends IService { R doSave(FdpDeviceDTO req); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultInfoService.java index e6565c7..1947e8a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultInfoService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultInfoService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.fdp.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.fdp.entity.FdpFaultInfoEntity; import com.hnac.hzims.fdp.vo.FdpFaultInfoVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; /** @@ -13,7 +14,7 @@ import org.springblade.core.tool.api.R; * @author lx * @since 2022-03-31 */ -public interface IFdpFaultInfoService extends BaseService { +public interface IFdpFaultInfoService extends IService { R fdpFaultSaveBatch(FdpFaultInfoVo fdpFaultInfoVo); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultService.java index 712bc1c..6acc76a 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpFaultService.java @@ -2,11 +2,12 @@ package com.hnac.hzims.fdp.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.fdp.dto.FdpFaultDTO; import com.hnac.hzims.fdp.entity.FdpFaultEntity; import com.hnac.hzims.fdp.response.FaultStateResp; import com.hnac.hzims.fdp.vo.FdpFaultVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -20,7 +21,7 @@ import java.util.Map; * @author xiashandong * @created 2021-05-25 17:32 **/ -public interface IFdpFaultService extends BaseService { +public interface IFdpFaultService extends IService { R doSave(FdpFaultDTO req); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpHistoryDataService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpHistoryDataService.java index d7a9640..f0553dd 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpHistoryDataService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpHistoryDataService.java @@ -11,7 +11,7 @@ import com.hnac.hzims.fdp.vo.FdpTaskVO; import com.hnac.hzims.fdp.vo.TaskStatisticsVo; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.vo.OperPhenomenonVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpMonitorService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpMonitorService.java index 31e19a7..f2cecf2 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpMonitorService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpMonitorService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.fdp.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.fdp.dto.FdpMonitorDTO; import com.hnac.hzims.fdp.dto.FdpMonitorExtendDTO; import com.hnac.hzims.fdp.dto.FdpTaskDTO; @@ -14,7 +15,7 @@ import com.hnac.hzims.fdp.response.MonitorFaultResp; import com.hnac.hzims.fdp.vo.*; import com.hnac.hzims.monitor.dto.FdpMonitorBindingDTO; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.RequestBody; @@ -28,7 +29,7 @@ import java.util.Map; * @author xiashandong * @created 2021-05-25 17:32 **/ -public interface IFdpMonitorService extends BaseService { +public interface IFdpMonitorService extends IService { /** * 获取Fdp监控点与数据平台监控点之间绑定关系 diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpTaskService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpTaskService.java index 73ba3d9..fda0d68 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpTaskService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/IFdpTaskService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.fdp.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.fdp.dto.FdpTaskDTO; import com.hnac.hzims.fdp.entity.FdpTaskEntity; import com.hnac.hzims.fdp.vo.FdpTaskVO; import com.hnac.hzims.fdp.vo.TaskStatisticsVo; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.vo.OperPhenomenonVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-05-25 17:32 **/ -public interface IFdpTaskService extends BaseService { +public interface IFdpTaskService extends IService { R doSave(FdpTaskDTO req); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/DiagnoseServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/DiagnoseServiceImpl.java index 0832622..26bcee6 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/DiagnoseServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/DiagnoseServiceImpl.java @@ -26,8 +26,6 @@ import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.tool.api.IResultCode; import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.ResultCode; import org.springblade.core.tool.utils.CollectionUtil; @@ -54,7 +52,6 @@ public class DiagnoseServiceImpl implements IDiagnoseService { private final FdpUrlConfiguration urlConfiguration; private final IAnalyseDataSearchClient analyseDataSearchClient; private final IFdpMonitorService monitorService; - private final BladeLogger logger; @Override public List getOutDatePredictModel(String stationId) { @@ -118,7 +115,7 @@ public class DiagnoseServiceImpl implements IDiagnoseService { .contentType("application/json").body(JSON.toJSONString(req)).execute().body(); JSONObject result = JSONObject.parseObject(response); if(result.getIntValue("code") != ResultCode.SUCCESS.getCode()) { - logger.error("diagnose:trainPredictModel",stationId + " 训练预测模型失败，结果为："+response); + log.error("diagnose:trainPredictModel",stationId + " 训练预测模型失败，结果为："+response); XxlJobLogger.log(stationId + " 训练预测模型失败，结果为：" + response); } } @@ -164,7 +161,7 @@ public class DiagnoseServiceImpl implements IDiagnoseService { if(!historyDataResult.isSuccess()) { XxlJobLogger.log("diagnose::getModelHistoryData"+info +"获取历史数据失败，错误信息为："+ JSON.toJSONString(historyDataResult)); - logger.error("diagnose::getModelHistoryData", + log.error("diagnose::getModelHistoryData", info+"获取历史数据失败，错误信息为："+ JSON.toJSONString(historyDataResult)); return; } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpDeviceServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpDeviceServiceImpl.java index 9a119dc..15c349b 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpDeviceServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpDeviceServiceImpl.java @@ -16,7 +16,7 @@ import com.hnac.hzims.fdp.service.IFdpFaultService; import com.hnac.hzims.fdp.service.IFdpMonitorService; import com.hnac.hzims.fdp.vo.FdpDeviceVO; import com.hnac.hzims.fdp.wrapper.FdpDeviceWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -33,7 +33,7 @@ import java.util.List; * @created 2021-05-25 17:32 **/ @Service -public class FdpDeviceServiceImpl extends BaseServiceImpl implements IFdpDeviceService { +public class FdpDeviceServiceImpl extends ServiceImpl implements IFdpDeviceService { @Autowired private IFdpFaultService fdpFaultService; @Autowired diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultInfoServiceImpl.java index 3e379a3..07d78b4 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultInfoServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.fdp.entity.FdpFaultInfoEntity; import com.hnac.hzims.fdp.mapper.FdpFaultInfoMapper; import com.hnac.hzims.fdp.service.IFdpFaultInfoService; import com.hnac.hzims.fdp.vo.FdpFaultInfoVo; -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.utils.CollectionUtil; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.List; * @since 2022-03-31 */ @Service -public class FdpFaultInfoServiceImpl extends BaseServiceImpl implements IFdpFaultInfoService { +public class FdpFaultInfoServiceImpl extends ServiceImpl implements IFdpFaultInfoService { @Override public R fdpFaultSaveBatch(FdpFaultInfoVo fdpFaultInfoVo) { diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultServiceImpl.java index 8c89517..4d5b720 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzims.operational.station.feign.IStationClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class FdpFaultServiceImpl extends BaseServiceImpl implements IFdpFaultService { +public class FdpFaultServiceImpl extends ServiceImpl implements IFdpFaultService { private final FdpFaultMapper fdpFaultMapper; private final ISysClient sysClient; private final IStationClient stationClient; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java index 7ac1019..721f0dc 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java @@ -61,7 +61,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -86,7 +86,7 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class FdpMonitorServiceImpl extends BaseServiceImpl implements IFdpMonitorService { +public class FdpMonitorServiceImpl extends ServiceImpl implements IFdpMonitorService { private final FdpDeviceMapper fdpDeviceMapper; private final IEmInfoService emInfoService; private final IAnalyseInstanceClient deviceInstanceClient; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java index 251b715..966ac90 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpQuestionServiceImpl.java @@ -19,7 +19,7 @@ import com.hnac.hzims.operational.station.feign.IStationClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -45,7 +45,6 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService { private final IStationClient stationClient; private final FdpUrlConfiguration fdpUrlConfiguration; - private final BladeLogger logger; @Override public boolean submitStationInfo(Integer fdpStationType,String stationCode, String stationDesc) { @@ -158,7 +157,7 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService { )).execute(); if(httpResponse.getStatus() != HttpServletResponse.SC_OK || !"1".equals(JSONObject.parseObject(httpResponse.body()).getString("success"))) { - logger.error("equipment:fdp:generateGraphInstance",httpResponse.body()); + log.error("equipment:fdp:generateGraphInstance",httpResponse.body()); } }); return true; @@ -205,11 +204,11 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService { JSONObject responseObject = JSONObject.parseObject(httpResponse.body()); if(httpResponse.getStatus() == HttpServletResponse.SC_OK && "1".equals(responseObject.getString("success"))) { - logger.info("FdpQuestion:deleteDevsetAnswer","FDP设备删除成功！站点ID为："+stationId+",设备编号为："+index); + log.info("FdpQuestion:deleteDevsetAnswer","FDP设备删除成功！站点ID为："+stationId+",设备编号为："+index); return JSONObject.parseObject(responseObject.getString("data"),Boolean.class); } else { - logger.error("FdpQuestion:deleteDevsetAnswer","FDP设备删除失败！站点ID为："+stationId+",设备编号为："+index); + log.error("FdpQuestion:deleteDevsetAnswer","FDP设备删除失败！站点ID为："+stationId+",设备编号为："+index); } return false; } @@ -229,7 +228,7 @@ public class FdpQuestionServiceImpl implements IFdpQuestionService { return JSONObject.parseObject(responseObject.getString("data"),Boolean.class); } else { - logger.error("FdpQuestion:deleteDevsetAnswer","FDP设备站点问题的答案失败！站点ID为："+stationId); + log.error("FdpQuestion:deleteDevsetAnswer","FDP设备站点问题的答案失败！站点ID为："+stationId); } return false; } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpTaskServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpTaskServiceImpl.java index 957d210..1d9630c 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpTaskServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpTaskServiceImpl.java @@ -1,7 +1,6 @@ package com.hnac.hzims.fdp.service.impl; import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,11 +17,12 @@ import com.hnac.hzims.fdp.wrapper.FdpTaskWrapper; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.feign.IOperPhenomenonClient; import com.hnac.hzims.operational.defect.vo.OperPhenomenonVO; +import org.springblade.core.log.exception.ServiceException; import com.hnac.hzims.util.HttpClientUtils; import com.hnac.hzims.util.pojo.HttpResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.api.R; @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class FdpTaskServiceImpl extends BaseServiceImpl implements IFdpTaskService { +public class FdpTaskServiceImpl extends ServiceImpl implements IFdpTaskService { private final IOperPhenomenonClient operPhenomenonClient; private final ISysClient sysClient; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/service/impl/ModelInstanceServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/service/impl/ModelInstanceServiceImpl.java index a4f847e..f564265 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/service/impl/ModelInstanceServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/service/impl/ModelInstanceServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzims.monitor.service.impl; import com.hnac.hzims.monitor.service.IModelInstanceService; import com.hnac.hzinfo.sdk.core.response.Result; -import com.hnac.hzinfo.sdk.core.response.ResultCode; +//import com.hnac.hzinfo.sdk.core.response.ResultCode; import com.hnac.hzinfo.sdk.v5.analyse.AnalyseDataHandlerClient; import com.hnac.hzinfo.sdk.v5.analyse.dto.AnalyseDataHandlerDTO; import lombok.AllArgsConstructor; @@ -24,6 +24,8 @@ public class ModelInstanceServiceImpl implements IModelInstanceService { @Override public boolean save(AnalyseDataHandlerDTO analyseDataHandlerDTO) { Result saveResult = analyseDataHandlerClient.save(analyseDataHandlerDTO); - return saveResult.getCode() == ResultCode.SUCCESS.getCode() && saveResult.isSuccess(); +// return saveResult.getCode() == ResultCode.SUCCESS.getCode() && saveResult.isSuccess(); + //todo tyty + return true; } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/util/HttpClientUtils.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/util/HttpClientUtils.java index 4d0174e..2d683c6 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/util/HttpClientUtils.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/util/HttpClientUtils.java @@ -1,9 +1,9 @@ package com.hnac.hzims.util; import com.alibaba.fastjson.JSONObject; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.util.pojo.HttpResponse; import lombok.extern.log4j.Log4j2; -import org.apache.commons.lang.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -20,7 +20,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.message.BasicNameValuePair; -import org.apache.http.params.CoreConnectionPNames; import javax.net.ssl.*; import java.io.ByteArrayOutputStream; diff --git a/hzims-service/equipment/src/main/resources/application-dev.yml b/hzims-service/equipment/src/main/resources/application-dev.yml deleted file mode 100644 index 38e97fc..0000000 --- a/hzims-service/equipment/src/main/resources/application-dev.yml +++ /dev/null @@ -1,44 +0,0 @@ - -#服务器端口 -server: - port: 8300 - -#数据源配置 -#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/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 - slave: - url: jdbc:mysql://175.6.40.67:3306/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=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 diff --git a/hzims-service/equipment/src/main/resources/application-prod.yml b/hzims-service/equipment/src/main/resources/application-prod.yml deleted file mode 100644 index da89262..0000000 --- a/hzims-service/equipment/src/main/resources/application-prod.yml +++ /dev/null @@ -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} diff --git a/hzims-service/equipment/src/main/resources/application-test.yml b/hzims-service/equipment/src/main/resources/application-test.yml deleted file mode 100644 index 4b4e157..0000000 --- a/hzims-service/equipment/src/main/resources/application-test.yml +++ /dev/null @@ -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} diff --git a/hzims-service/equipment/src/main/resources/application.yml b/hzims-service/equipment/src/main/resources/application.yml deleted file mode 100644 index bedb9c4..0000000 --- a/hzims-service/equipment/src/main/resources/application.yml +++ /dev/null @@ -1,21 +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 diff --git a/hzims-service/equipment/src/main/resources/template/template.yml b/hzims-service/equipment/src/main/resources/template/template.yml new file mode 100644 index 0000000..359a66e --- /dev/null +++ b/hzims-service/equipment/src/main/resources/template/template.yml @@ -0,0 +1,66 @@ +#服务器端口 +server: + port: 8300 + + +#数据源配置 +#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: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + slave: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + + + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims + + + +xxl: + job: + accessToken: '' + admin: + addresses: http://${hzims.server.ip}:7009/xxl-job-admin + executor: + appname: hzims-equipment + ip: "${hzims.server.ip}" + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: -1 + port: 28300 + +demo: + name: aaa \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java index 4e7c270..647c7d0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java @@ -4,9 +4,11 @@ import com.hnac.hzims.alarm.config.constants.AlarmConstants; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import javax.annotation.Resource; @@ -14,20 +16,20 @@ import javax.annotation.Resource; /** * @author ysj */ -@EnableBladeFeign +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzims"}) +@MapperScan(basePackages = {"com.hnac.hzims.**.mapper"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @SpringCloudApplication -@MapperScan("com.hnac.hzims.**.mapper.**") @ComponentScan(basePackages = {"com.hnac.hzims.alarm.*","com.hnac.hzims.business.*"}) -@Resource -public class AlarmApplication extends SpringBootServletInitializer { +public class AlarmApplication { public static void main(String[] args) { BladeApplication.run(AlarmConstants.APP_NAME, AlarmApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, AlarmConstants.APP_NAME, AlarmApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, AlarmConstants.APP_NAME, AlarmApplication.class); +// } } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java index 29fc7ae..2c67240 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java @@ -1,17 +1,18 @@ package com.hnac.hzims.alarm.config.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; import com.hnac.hzims.alarm.config.vo.AlarmConfigSourceVo; import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface AlarmConfigDetailService extends BaseService { +public interface AlarmConfigDetailService extends IService { boolean defaults(AlarmConfigEntity entity); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java index e8810b0..15201ce 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java @@ -1,17 +1,18 @@ package com.hnac.hzims.alarm.config.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; import com.hnac.hzims.alarm.config.vo.AlarmConfigVo; import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface AlarmConfigService extends BaseService { +public interface AlarmConfigService extends IService { IPage pageCondition(IPage page,AlarmConfigEntity entity); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java index 4965def..b3dd0b6 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java @@ -16,7 +16,7 @@ import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.BeanUtils; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @Service @Slf4j -public class AlarmConfigDetailServiceImpl extends BaseServiceImpl implements AlarmConfigDetailService { +public class AlarmConfigDetailServiceImpl extends ServiceImpl implements AlarmConfigDetailService { @Autowired private AlarmDefaultConfigMapper alarmDefaultConfigMapper; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java index a6fcf7d..b05c294 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; @@ -29,7 +29,7 @@ import java.util.List; @AllArgsConstructor @Service @Slf4j -public class AlarmConfigServiceImpl extends BaseServiceImpl implements AlarmConfigService { +public class AlarmConfigServiceImpl extends ServiceImpl implements AlarmConfigService { private final AlarmConfigDetailService detailService; @@ -63,7 +63,7 @@ public class AlarmConfigServiceImpl extends BaseServiceImpl ids) { - if(!this.deleteLogic(ids)){ + if(!this.removeByIds(ids)){ return false; } return detailService.remove(Wrappers.lambdaQuery() diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java index 20c2f8a..4ca596c 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java @@ -19,7 +19,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; -import org.springblade.server.domain.Sys; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java index 87acece..68f4b43 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java @@ -4,10 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.DroolsAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; -import com.hnac.hzims.common.utils.DateUtil; import com.hnac.hzinfo.subscribe.SubscribeCallBack; import lombok.extern.slf4j.Slf4j; -import oracle.sql.DATE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java index 307875d..3739df0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.system.user.entity.User; @@ -49,7 +49,7 @@ public class AlarmHandleController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入AlarmHandleEntity") @@ -64,7 +64,7 @@ public class AlarmHandleController extends BladeController { /** * 告警处理用户查询 */ - @ApiLog + @GetMapping("/handleUser") @ApiOperationSupport(order = 3) @ApiOperation(value = "告警通知人", notes = "告警通知人") diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java index 19e72b9..9547b48 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.alarm.show.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmHandleDetailEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj * @date 2023/03/09 09:19:13 * @version 4.0.0 */ -public interface AlarmHandleDetailService extends BaseService { +public interface AlarmHandleDetailService extends IService { } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleFlowService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleFlowService.java index 6101e4e..3a83877 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleFlowService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleFlowService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.alarm.show.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity; import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; @@ -11,7 +12,7 @@ import org.springblade.core.tool.api.R; * @date 2023/03/09 09:19:13 * @version 4.0.0 */ -public interface AlarmHandleFlowService extends BaseService { +public interface AlarmHandleFlowService extends IService { R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java index 8911c3d..9ff45bc 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.alarm.show.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity; import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.alarm.show.vo.HandleQueryVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.system.user.entity.User; @@ -16,7 +17,7 @@ import java.util.List; * @date 2023/03/09 09:19:13 * @version 4.0.0 */ -public interface AlarmHandleService extends BaseService { +public interface AlarmHandleService extends IService { boolean execute(AlarmHandleFlowEntity param); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java index 8b62437..65937a7 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.alarm.show.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.config.vo.AlarmCountVo; import com.hnac.hzims.equipment.entity.EmVideoBandingEntity; -import org.springblade.core.mp.base.BaseService; + import org.springframework.web.socket.TextMessage; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; /** * @author ysj */ -public interface AlarmService extends BaseService { +public interface AlarmService extends IService { IPage alarms(AlarmEntity alarm, IPage page); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java index 36df866..0e3c5ba 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.alarm.show.mapper.AlarmHandleDetailMapper; import com.hnac.hzims.alarm.show.service.AlarmHandleDetailService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @Slf4j @Service @RequiredArgsConstructor -public class AlarmHandleDetailServiceImpl extends BaseServiceImpl implements AlarmHandleDetailService { +public class AlarmHandleDetailServiceImpl extends ServiceImpl implements AlarmHandleDetailService { } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java index 01bed58..eb59ac6 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java @@ -18,7 +18,7 @@ import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.flow.core.feign.IFlowClient; import org.springblade.system.feign.ISysClient; @@ -35,7 +35,7 @@ import java.util.*; @Slf4j @Service @RequiredArgsConstructor -public class AlarmHandleFlowServiceImpl extends BaseServiceImpl implements AlarmHandleFlowService { +public class AlarmHandleFlowServiceImpl extends ServiceImpl implements AlarmHandleFlowService { private final IMessageClient messageClient; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java index 849a47e..9c1b8aa 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzims.fdp.feign.IFdpDiagnoseClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class AlarmHandleServiceImpl extends BaseServiceImpl implements AlarmHandleService { +public class AlarmHandleServiceImpl extends ServiceImpl implements AlarmHandleService { private final AlarmHandleDetailService detailService; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java index 2b769ec..b83bf9f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java @@ -27,7 +27,7 @@ import com.hnac.hzinfo.sdk.v5.project.ProjectClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @Service @Slf4j -public class AlarmServiceImpl extends BaseServiceImpl implements AlarmService { +public class AlarmServiceImpl extends ServiceImpl implements AlarmService { private final MessageService messageService; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java index 27c14dc..f5896ef 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.alarm.source.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmHistoryEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface AlarmHistoryService extends BaseService { +public interface AlarmHistoryService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java index 2ceee52..734e655 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java @@ -1,11 +1,13 @@ package com.hnac.hzims.alarm.source.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmHistoryEntity; import com.hnac.hzims.alarm.source.mapper.AlarmHistoryMapper; +import com.hnac.hzims.alarm.source.service.AlarmHistoryService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.base.BaseServiceImpl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +16,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service @Slf4j -public class AlarmHistoryServiceImpl extends BaseServiceImpl implements BaseService { +public class AlarmHistoryServiceImpl extends ServiceImpl implements AlarmHistoryService { } \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java index c39935d..c810366 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/BusinessEarlyService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.business.early.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import com.hnac.hzims.business.early.vo.BusinessEarlyVo; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface BusinessEarlyService extends BaseService { +public interface BusinessEarlyService extends IService { IPage pageCondition(IPage page, BusinessEarlyVo early); } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java index 07e9a0e..3fc24b1 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/early/service/impl/BusinessEarlyServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.business.early.entity.BusinessEarlyEntity; import com.hnac.hzims.business.early.vo.BusinessEarlyVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service @Slf4j -public class BusinessEarlyServiceImpl extends BaseServiceImpl implements BusinessEarlyService { +public class BusinessEarlyServiceImpl extends ServiceImpl implements BusinessEarlyService { @Override public IPage pageCondition(IPage page, BusinessEarlyVo early) { diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java index 3d0d6a2..a786ad2 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/InterruptionService.java @@ -1,20 +1,21 @@ package com.hnac.hzims.business.interruption.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.business.interruption.entity.InterruptionEntity; import com.hnac.hzims.business.interruption.vo.InterruptionDetailVo; import com.hnac.hzims.business.interruption.vo.InterruptionParamVo; import com.hnac.hzims.business.interruption.vo.InterruptionStationVo; import com.hnac.hzims.business.interruption.vo.InterruptionVo; import com.hnac.hzims.operational.station.entity.StationEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface InterruptionService extends BaseService { +public interface InterruptionService extends IService { List interruptionStations(); diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java index 9fd4e74..085eb63 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/business/interruption/service/impl/InterruptionServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.business.interruption.vo.InterruptionStationVo; import com.hnac.hzims.business.interruption.vo.InterruptionVo; import lombok.AllArgsConstructor; 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.DateUtil; import org.springblade.core.tool.utils.Func; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @Service @Slf4j -public class InterruptionServiceImpl extends BaseServiceImpl implements InterruptionService { +public class InterruptionServiceImpl extends ServiceImpl implements InterruptionService { /** * 数据中断站点查询 diff --git a/hzims-service/hzims-alarm/src/main/resources/template/template.yml b/hzims-service/hzims-alarm/src/main/resources/template/template.yml new file mode 100644 index 0000000..c1f8602 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/resources/template/template.yml @@ -0,0 +1,76 @@ +#服务器端口 +server: + port: 8102 + + +#数据源配置 +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_alarm?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} + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + + +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.alarm +hzims: + mqtt: + url: tcp://${hzinfo.db.series.ip}:9036:1883 + group: hzims-alarm + username: admin + password: hzims@emqx + system: + wss-url: ws://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe + condition: + wss-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe + fdp: + alarm-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe + level: + wss-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/alarm + msg: + template: aliyun-alarm-sms + enabled: false + wxPush: + template: hIgINCsjpG-gyCKh8wzwBeRL9tanTLqRDgv-X8B9vyc + enabled: false + + +logging: + level: + com.hnac.hzims.alarm : INFO + +blade: + data: + sdk: + enabled: true + url: http://${hzinfo.db.series.ip}/api/hzinfo-data-config + ctrlUrl: http://${hzinfo.db.series.ip}/api/hzinfo-data-handler + appId: '1635888805125099521' + appSecret: f4b6a4dc696b36445d2e5d38bbab2417 + redisIp: ${hzinfo.db.series.ip} + redisPort: 3577 + password: L_MM&h=+Nm&p)U9sk.uH + maxKeys: 1000 \ No newline at end of file diff --git a/hzims-service/hzims-basic/pom.xml b/hzims-service/hzims-basic/pom.xml index 9478d7c..f92dad1 100644 --- a/hzims-service/hzims-basic/pom.xml +++ b/hzims-service/hzims-basic/pom.xml @@ -109,6 +109,12 @@ org.eclipse.paho org.eclipse.paho.client.mqttv3 + + org.jfree + jfreechart + 1.5.0 + compile + diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/BasicApplication.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/BasicApplication.java index 3962111..9b1a48f 100644 --- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/BasicApplication.java +++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/BasicApplication.java @@ -4,9 +4,11 @@ import com.hnac.hzims.basic.constants.BasicConstants; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import javax.annotation.Resource; @@ -19,14 +21,17 @@ import javax.annotation.Resource; @MapperScan("com.hnac.hzims.**.mapper.**") @ComponentScan(basePackages = {"com.hnac.hzims.basic.*"}) @Resource +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) public class BasicApplication extends SpringBootServletInitializer { public static void main(String[] args) { BladeApplication.run(BasicConstants.APP_NAME, BasicApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, BasicConstants.APP_NAME, BasicApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, BasicConstants.APP_NAME, BasicApplication.class); +// } + } diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/PresonManagementController.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/PresonManagementController.java index 9b9e548..4f8a808 100644 --- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/PresonManagementController.java +++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/PresonManagementController.java @@ -1,6 +1,6 @@ package com.hnac.hzims.basic.controller; -import com.alibaba.druid.support.json.JSONUtils; +import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -111,7 +111,7 @@ public class PresonManagementController extends BladeController { map.put("isSuccess", "false"); map.put("msg", "档案管理报表导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSONUtil.toJsonStr(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetNoticeServiceImpl.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetNoticeServiceImpl.java index d31c2f2..5a446ca 100644 --- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetNoticeServiceImpl.java +++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetNoticeServiceImpl.java @@ -1,11 +1,12 @@ package com.hnac.hzims.basic.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.basic.entity.CertificatetNoticeEntity; import com.hnac.hzims.basic.mapper.CertificatetNoticeMapper; import com.hnac.hzims.basic.service.IImsCertificatetNoticeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,5 +17,5 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor -public class CertificatetNoticeServiceImpl extends BaseServiceImpl implements IImsCertificatetNoticeService { +public class CertificatetNoticeServiceImpl extends ServiceImpl implements IImsCertificatetNoticeService { } diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetServiceImpl.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetServiceImpl.java index bbd8081..ed1a520 100644 --- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetServiceImpl.java +++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetServiceImpl.java @@ -1,11 +1,12 @@ package com.hnac.hzims.basic.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.basic.entity.CertificatetEntity; import com.hnac.hzims.basic.mapper.CertificatetMapper; import com.hnac.hzims.basic.service.IImsCertificatetService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -17,5 +18,5 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor -public class CertificatetServiceImpl extends BaseServiceImpl implements IImsCertificatetService { +public class CertificatetServiceImpl extends ServiceImpl implements IImsCertificatetService { } diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java index c7eb8ef..02ca7cf 100644 --- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java +++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.basic.entity.CertificatetEntity; import com.hnac.hzims.basic.entity.PersonManagemetEntity; import com.hnac.hzims.basic.mapper.PersonManagemetMapper; @@ -17,7 +18,7 @@ import com.hnac.hzims.common.logs.utils.StringUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -44,7 +45,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class PresonManagementServiceImpl extends BaseServiceImpl implements IImsPresonManagementService { +public class PresonManagementServiceImpl extends ServiceImpl implements IImsPresonManagementService { private final ISysClient sysClient; @@ -88,10 +89,10 @@ public class PresonManagementServiceImpl extends BaseServiceImplquery().lambda() + Long count = baseMapper.selectCount(Wrappers.query().lambda() .eq(PersonManagemetEntity::getUserId, personManagemetEntity.getUserId()) .eq(PersonManagemetEntity::getIsDeleted, 0)); - if (count>0){ + if (count>0L){ return R.fail("该用户已存在，请重新编辑！"); } this.saveOrUpdate(personManagemetEntity); diff --git a/hzims-service/hzims-basic/src/main/resources/application.yml b/hzims-service/hzims-basic/src/main/resources/application.yml deleted file mode 100644 index 71b4cf6..0000000 --- a/hzims-service/hzims-basic/src/main/resources/application.yml +++ /dev/null @@ -1,41 +0,0 @@ -#服务器端口 -server: - port: 8430 - - -#数据源配置 -spring: - main: - allow-bean-definition-overriding: true - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - url: jdbc:mysql://192.168.60.34:3576/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: hzinfo - password: 1qaz2WSX! - - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - -blade: - data-scope: - enabled: false - lock: - enabled: true - address: redis://192.168.1.20:3577 - password: 1qaz2WSX@redis - database: 0 - ssl: false diff --git a/hzims-service/hzims-basic/src/main/resources/bootstrap.yml b/hzims-service/hzims-basic/src/main/resources/bootstrap.yml deleted file mode 100644 index 0abf99a..0000000 --- a/hzims-service/hzims-basic/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,7 +0,0 @@ -spring: - cloud: - nacos: - discovery: - server-addr: 175.6.40.67:10042 - - diff --git a/hzims-service/hzims-basic/src/main/resources/template/template.yml b/hzims-service/hzims-basic/src/main/resources/template/template.yml new file mode 100644 index 0000000..6a39996 --- /dev/null +++ b/hzims-service/hzims-basic/src/main/resources/template/template.yml @@ -0,0 +1,58 @@ +#服务器端口 +server: + port: 8550 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + dynamic: + datasource: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.basic + +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: 28200 + +blade: + data-scope: + enabled: false + lock: + enabled: true + address: redis://192.168.1.20:3577 + password: 1qaz2WSX@redis + database: 0 + ssl: false \ No newline at end of file diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java index 2709c09..920a351 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java @@ -19,15 +19,15 @@ import javax.annotation.Resource; @ComponentScan(basePackages = {"com.hnac.hzims.bigmodel.*"}) @Resource @ComponentScan(basePackages = {"com.hnac.hzims.*"}) -public class HzimsBigModelApplication extends SpringBootServletInitializer { +public class HzimsBigModelApplication { public static void main(String[] args) { BladeApplication.run(BigModelConstants.APP_NAME, HzimsBigModelApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, BigModelConstants.APP_NAME, HzimsBigModelApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, BigModelConstants.APP_NAME, HzimsBigModelApplication.class); +// } } diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFuncParamService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFuncParamService.java index 39fae6a..813dcd1 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFuncParamService.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFuncParamService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.bigmodel.function.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.bigmodel.entity.FuncParamEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * @Author: huangxing * @Date: 2024/04/26 11:12 */ -public interface IFuncParamService extends BaseService { +public interface IFuncParamService extends IService { /** * 根据函数ID获取参数列表 diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFunctionService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFunctionService.java index 6a9e59d..d2c40fc 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFunctionService.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/IFunctionService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.bigmodel.function.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.bigmodel.entity.FunctionEntity; -import org.springblade.core.mp.base.BaseService; + /** * @Author: huangxing * @Date: 2024/04/26 11:08 */ -public interface IFunctionService extends BaseService { +public interface IFunctionService extends IService { FunctionEntity getFunctionByCode(String code); diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FuncParamServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FuncParamServiceImpl.java index e7e2dae..18910c9 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FuncParamServiceImpl.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FuncParamServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.bigmodel.entity.FuncParamEntity; import com.hnac.hzims.bigmodel.function.mapper.FuncParamMapper; import com.hnac.hzims.bigmodel.function.service.IFuncParamService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; */ @Service @Slf4j -public class FuncParamServiceImpl extends BaseServiceImpl implements IFuncParamService { +public class FuncParamServiceImpl extends ServiceImpl implements IFuncParamService { @Override public List getParamsByFuncId(Long funcId) { diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FunctionServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FunctionServiceImpl.java index 0619ddb..9c03b3a 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FunctionServiceImpl.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/service/impl/FunctionServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.bigmodel.function.mapper.FunctionMapper; import com.hnac.hzims.bigmodel.function.service.IFunctionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j @AllArgsConstructor -public class FunctionServiceImpl extends BaseServiceImpl implements IFunctionService { +public class FunctionServiceImpl extends ServiceImpl implements IFunctionService { @Override public FunctionEntity getFunctionByCode(String code) { diff --git a/hzims-service/hzims-big-model/src/main/resources/template/template.yml b/hzims-service/hzims-big-model/src/main/resources/template/template.yml new file mode 100644 index 0000000..447d972 --- /dev/null +++ b/hzims-service/hzims-big-model/src/main/resources/template/template.yml @@ -0,0 +1,75 @@ +#服务器端口 +server: + port: 8135 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +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_big_model?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} + redis: + # redis数据库索引（默认为0），我们使用索引为0的数据库，避免和其他数据库冲突 + database: 2 + # redis服务器地址（默认为localhost） + host: 192.168.60.29 + # redis端口（默认为6379） + port: 3577 + # redis访问密码（默认为空） + password: 1qaz2WSX@redis + + +fdp: + host: http://192.168.60.16:9997 + url: + assistantAsk: /qa/assistant_ask + assistantStatus: /qa/assistant_status + askAbort: /qa/ask_abort + updateVideo: /kn/update_video + updateCanvas: /kn/update_canvas + updateFault: /kn/update_fault + assistantSpecialAsk: /qa/assistant_special_ask + assistantKnowledgeAsk: /qa/assistant_knowledge_ask + hotQuestion: /qa/question_recommand +xxl: + job: + accessToken: '' + admin: + addresses: http://192.168.60.29:7009/xxl-job-admin + executor: + appname: hzims-big-model + ip: 172.31.0.12 + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 7 + port: 28135 + +blade: + data: + sdk: + enabled: true + url: http://192.168.60.29/api/hzinfo-data-config + ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler + scadaUrl: http://192.168.60.29/api/hzinfo-data-scada + appId: '1635888805125099521' + appSecret: f4b6a4dc696b36445d2e5d38bbab2417 + redisIp: 192.168.60.34 + redisPort: 3577 + password: L_MM&h=+Nm&p)U9sk.uH + maxKeys: 1000 + data-scope: + enabled: false + lock: + enabled: true + address: redis://192.168.60.29:3577 + password: 1qaz2WSX@redis + database: 0 + ssl: false \ No newline at end of file diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java index 71bedcb..37a26e1 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java @@ -6,19 +6,23 @@ import org.springblade.core.launch.BladeApplication; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -@EnableBladeFeign -@SpringCloudApplication + + +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) @MapperScan("com.hnac.hzims.**.mapper.**") @ComponentScan(basePackages = {"com.hnac.*"}) +@ComponentScan(basePackages = {"com.hnac.hzims.*"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) public class MiddleApplication { - static { - System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042"); - System.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:10042"); - System.setProperty("spring.cloud.nacos.username", "nacos"); - System.setProperty("spring.cloud.nacos.password", "nacos"); - } +// static { +// System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042"); +// System.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:10042"); +// System.setProperty("spring.cloud.nacos.username", "nacos"); +// System.setProperty("spring.cloud.nacos.password", "nacos"); +// } public static void main(String[] args) { BladeApplication.run("hzims-middle", MiddleApplication.class, args); diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java index 590ce0f..b6ada10 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/service/impl/ProcessDictServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.middle.processflow.entity.ProcessDict; import com.hnac.hzims.middle.processflow.mapper.ProcessDictMapper; import com.hnac.hzims.middle.processflow.service.ProcessDictService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/Swagger2Config.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/Swagger2Config.java index b7c5e2a..4059d79 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/Swagger2Config.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/Swagger2Config.java @@ -11,7 +11,6 @@ import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * @Author WL @@ -20,7 +19,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * @Date 2023/4/13 13:40 */ @Configuration -@EnableSwagger2 public class Swagger2Config implements WebMvcConfigurer { @@ -43,7 +41,8 @@ public class Swagger2Config implements WebMvcConfigurer { .apiInfo(webApiInfo()) .select() //只显示api路径下的页面 - .paths(Predicates.and(PathSelectors.regex("/systemlog/.*"))) + //todo tyty +// .paths(Predicates.and(PathSelectors.regex("/systemlog/.*"))) .build(); } diff --git a/hzims-service/hzims-middle/src/main/resources/application.yml b/hzims-service/hzims-middle/src/main/resources/application.yml deleted file mode 100644 index 180d5d3..0000000 --- a/hzims-service/hzims-middle/src/main/resources/application.yml +++ /dev/null @@ -1,41 +0,0 @@ -#服务器端口 -server: - port: 8400 - - -#数据源配置 -spring: - main: - allow-bean-definition-overriding: true - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - url: jdbc:mysql://192.168.1.20:3576/dev_hzims_middle?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 - - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - -blade: - data-scope: - enabled: false - lock: - enabled: true - address: redis://192.168.1.20:3577 - password: 1qaz2WSX@redis - database: 0 - ssl: false diff --git a/hzims-service/hzims-middle/src/main/resources/bootstrap.yml b/hzims-service/hzims-middle/src/main/resources/bootstrap.yml deleted file mode 100644 index 0abf99a..0000000 --- a/hzims-service/hzims-middle/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,7 +0,0 @@ -spring: - cloud: - nacos: - discovery: - server-addr: 175.6.40.67:10042 - - diff --git a/hzims-service/hzims-middle/src/main/resources/template/template.yml b/hzims-service/hzims-middle/src/main/resources/template/template.yml new file mode 100644 index 0000000..370e383 --- /dev/null +++ b/hzims-service/hzims-middle/src/main/resources/template/template.yml @@ -0,0 +1,47 @@ +#服务器端口 +server: + port: 8400 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +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_middle?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} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.middle,org.springbalde + +blade: + data-scope: + enabled: false + lock: + enabled: true + address: redis://192.168.60.34:3577 + password: L_MM&h=+Nm&p)U9sk.uH + database: 2 + ssl: false \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java index 9d6940b..49b5768 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.basic.entity.CertificatetEntity; import com.hnac.hzims.basic.entity.CertificatetNoticeEntity; import com.hnac.hzims.basic.entity.PersonManagemetEntity; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; import com.hnac.hzims.message.entity.config.SmsConfigEntity; @@ -17,8 +18,7 @@ import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.junit.jupiter.api.Test; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -28,7 +28,6 @@ import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.text.ParseException; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmDefaulConfigService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmDefaulConfigService.java index 6ad4b2a..f9fbe25 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmDefaulConfigService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmDefaulConfigService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.alarm; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmDefaultConfigEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface AlarmDefaulConfigService extends BaseService { +public interface AlarmDefaulConfigService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java index 9fe12cc..fe68a2d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.alarm; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.alarm.config.entity.AlarmEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface AlarmQueryService extends BaseService { +public interface AlarmQueryService extends IService { void clear(String param); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/InterruptionAlarmService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/InterruptionAlarmService.java index 8579c3d..39e409b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/InterruptionAlarmService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/InterruptionAlarmService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.alarm; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.business.interruption.entity.InterruptionEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface InterruptionAlarmService extends BaseService { +public interface InterruptionAlarmService extends IService { List aborts(List codes); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmDefaulConfigServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmDefaulConfigServiceImpl.java index 2cd8f08..02432db 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmDefaulConfigServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmDefaulConfigServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.alarm.AlarmDefaulConfigMapper; import com.hnac.hzims.scheduled.service.alarm.AlarmDefaulConfigService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @DS("alarm") -public class AlarmDefaulConfigServiceImpl extends BaseServiceImpl implements AlarmDefaulConfigService { +public class AlarmDefaulConfigServiceImpl extends ServiceImpl implements AlarmDefaulConfigService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java index 41790e9..b4c7d28 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.scheduled.service.alarm.AlarmQueryService; import com.hnac.hzims.scheduled.service.operation.station.StationService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springblade.core.tool.utils.Func; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; @Service @Slf4j @DS("alarm") -public class AlarmQueryServiceImpl extends BaseServiceImpl implements AlarmQueryService { +public class AlarmQueryServiceImpl extends ServiceImpl implements AlarmQueryService { @Override diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/InterruptionAlarmServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/InterruptionAlarmServiceImpl.java index 31b900e..22333f9 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/InterruptionAlarmServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/InterruptionAlarmServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.scheduled.mapper.alarm.InterruptionAlrmMapper; import com.hnac.hzims.scheduled.service.alarm.InterruptionAlarmService; import lombok.AllArgsConstructor; 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.StringUtil; import org.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Service @Slf4j @DS("alarm") -public class InterruptionAlarmServiceImpl extends BaseServiceImpl implements InterruptionAlarmService { +public class InterruptionAlarmServiceImpl extends ServiceImpl implements InterruptionAlarmService { /** * 查询站点数据中断 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java index f1b2210..f99b38b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -19,5 +19,5 @@ import org.springframework.stereotype.Service; @Slf4j @RequiredArgsConstructor @DS("basic") -public class CertificatetNoticeServiceImpl extends BaseServiceImpl implements IImsCertificatetNoticeService { +public class CertificatetNoticeServiceImpl extends ServiceImpl implements IImsCertificatetNoticeService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java index 79b890c..9d099f9 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.basic.CertificatetMapper; import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -19,5 +19,5 @@ import org.springframework.stereotype.Service; @Slf4j @RequiredArgsConstructor @DS("basic") -public class CertificatetServiceImpl extends BaseServiceImpl implements IImsCertificatetService { +public class CertificatetServiceImpl extends ServiceImpl implements IImsCertificatetService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java index 04b2f84..b419d3f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper; import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; @Slf4j @RequiredArgsConstructor @DS("basic") -public class PresonManagementServiceImpl extends BaseServiceImpl implements IImsPresonManagementService { +public class PresonManagementServiceImpl extends ServiceImpl implements IImsPresonManagementService { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceParamService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceParamService.java index 90ab7db..ec4fd99 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceParamService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceParamService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.equipment; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmParamEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface DeviceParamService extends BaseService { +public interface DeviceParamService extends IService { List params(); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceService.java index 443eaec..dab5c04 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/DeviceService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.scheduled.service.equipment; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.equipment.vo.RideDeviceVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface DeviceService extends BaseService { +public interface DeviceService extends IService { List device(); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java index 52f4d3a..e74fa59 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/PlanService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.equipment; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.PlanGenerationEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface PlanService extends BaseService { +public interface PlanService extends IService { // 查询计划发电量 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java index 3fe8199..0f0753a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/WorkshopInfoService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.equipment; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.equipment.entity.WorkshopInfoEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface WorkshopInfoService extends BaseService { +public interface WorkshopInfoService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceParamServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceParamServiceImpl.java index de5500c..ab0a610 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceParamServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceParamServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.equipment.DeviceParamMapper; import com.hnac.hzims.scheduled.service.equipment.DeviceParamService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +18,7 @@ import java.util.List; @Service @Slf4j @DS("equipment") -public class DeviceParamServiceImpl extends BaseServiceImpl implements DeviceParamService { +public class DeviceParamServiceImpl extends ServiceImpl implements DeviceParamService { /** diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceServiceImpl.java index ff5b613..423e38d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/DeviceServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.scheduled.service.equipment.DeviceParamService; import com.hnac.hzims.scheduled.service.equipment.DeviceService; import lombok.AllArgsConstructor; 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.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; @Service @Slf4j @DS("equipment") -public class DeviceServiceImpl extends BaseServiceImpl implements DeviceService { +public class DeviceServiceImpl extends ServiceImpl implements DeviceService { private final DeviceParamService deviceParamService; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java index 78e1ebe..7403790 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/PlanServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.equipment.PlanMapper; import com.hnac.hzims.scheduled.service.equipment.PlanService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +18,7 @@ import java.util.List; @Service @Slf4j @DS("equipment") -public class PlanServiceImpl extends BaseServiceImpl implements PlanService { +public class PlanServiceImpl extends ServiceImpl implements PlanService { /** * 查询计划发电量 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java index fc1d94b..5f6246b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.equipment.WorkshopInfoMapper; import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService; import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @DS("equipment") -public class WorkshopInfoServiceImpl extends BaseServiceImpl implements WorkshopInfoService { +public class WorkshopInfoServiceImpl extends ServiceImpl implements WorkshopInfoService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java index 6d25531..5dcbb5b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.scheduled.service.inspect; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface TaskService extends BaseService { +public interface TaskService extends IService { DutyInspectTaskVO task(String start, String end, List areas); } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java index 292a9bc..7191f38 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; import lombok.AllArgsConstructor; 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.springframework.stereotype.Service; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; @Slf4j @AllArgsConstructor @DS("inspect") -public class TaskServiceImpl extends BaseServiceImpl implements TaskService { +public class TaskServiceImpl extends ServiceImpl implements TaskService { /** * 时间区间机构的巡检任务数据查询 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/RecordService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/RecordService.java index 6710773..cf509bc 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/RecordService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/RecordService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.scheduled.service.operation.alarm; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface RecordService extends BaseService { +public interface RecordService extends IService { Long insertAlert(String stationId, String monitorId); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/RecordServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/RecordServiceImpl.java index b6e6f67..0cce9d4 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/RecordServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/RecordServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.RecordMapper; import com.hnac.hzims.scheduled.service.operation.alarm.RecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.Date; @@ -16,7 +16,7 @@ import java.util.Date; @Service @RequiredArgsConstructor @Slf4j -public class RecordServiceImpl extends BaseServiceImpl implements RecordService { +public class RecordServiceImpl extends ServiceImpl implements RecordService { /** * 添加告警 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/AccessService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/AccessService.java index 5a4babd..499bb87 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/AccessService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/AccessService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.main.vo.OverhaulVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface AccessService extends BaseService { +public interface AccessService extends IService { OverhaulVo overhaul_count(List areas,String start, String end); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java index 73fbb5f..8408632 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import com.hnac.hzims.operational.defect.vo.SolveHomeVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author Lch */ -public interface DefectService extends BaseService { +public interface DefectService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java index 192ed9a..e38e2ad 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyMainService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface DutyMainService extends BaseService { +public interface DutyMainService extends IService { ImsDutyMainFeignVO mainPerson(Long classId, String date); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java index a0b20b1..13f749a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DutyService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.DutyInfoVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface DutyService extends BaseService { +public interface DutyService extends IService { List dutyData(List collect); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java index f8c1181..158070d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenancePlanService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface MaintenancePlanService extends BaseService { +public interface MaintenancePlanService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java index 963d895..966882a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.vo.MaintainVo; import com.hnac.hzims.operational.main.vo.RegularWorkVO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.Date; import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; /** * @author ysj */ -public interface MaintenanceService extends BaseService { +public interface MaintenanceService extends IService { Integer maintenanceCount(List areas); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java index 4cc1312..b03a38a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java @@ -1,17 +1,18 @@ package com.hnac.hzims.scheduled.service.operation.business; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.operational.main.vo.ShortagesVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface PhenomenonService extends BaseService { +public interface PhenomenonService extends IService { SolveHomeVO solve_count(List deptIds, String start, String end); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/AccessServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/AccessServiceImpl.java index 8c2d21e..595ed6e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/AccessServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/AccessServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.scheduled.mapper.operation.AccessMapper; import com.hnac.hzims.scheduled.service.operation.business.AccessService; import lombok.AllArgsConstructor; 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.Func; import org.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class AccessServiceImpl extends BaseServiceImpl implements AccessService { +public class AccessServiceImpl extends ServiceImpl implements AccessService { /** * 巡检数量统计 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java index 9efd2c3..7fdec3a 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.scheduled.mapper.operation.DefectMapper; import com.hnac.hzims.scheduled.service.operation.business.DefectService; import lombok.AllArgsConstructor; -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.ObjectUtil; import org.springframework.stereotype.Service; @@ -24,6 +24,6 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class DefectServiceImpl extends BaseServiceImpl implements DefectService { +public class DefectServiceImpl extends ServiceImpl implements DefectService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java index 626bcc0..18768f0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyMainServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; import com.hnac.hzims.scheduled.mapper.operation.DutyMainMapper; import com.hnac.hzims.scheduled.service.operation.business.DutyMainService; 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.ObjectUtil; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class DutyMainServiceImpl extends BaseServiceImpl implements DutyMainService { +public class DutyMainServiceImpl extends ServiceImpl implements DutyMainService { @Override diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java index 55531a5..1fbc5ee 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DutyServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.scheduled.mapper.operation.DutyPersonMapper; import com.hnac.hzims.scheduled.service.operation.business.DutyService; import lombok.AllArgsConstructor; 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.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class DutyServiceImpl extends BaseServiceImpl implements DutyService { +public class DutyServiceImpl extends ServiceImpl implements DutyService { private final DutyPersonMapper dutyPersonMapper; private final DutyGroupMapper dutyGroupMapper; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java index 3de2980..22f564c 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenancePlanServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.MaintenancePlanMapper; import com.hnac.hzims.scheduled.service.operation.business.MaintenancePlanService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j -public class MaintenancePlanServiceImpl extends BaseServiceImpl implements MaintenancePlanService { +public class MaintenancePlanServiceImpl extends ServiceImpl implements MaintenancePlanService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java index fd7c052..1b406d1 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; import lombok.RequiredArgsConstructor; 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.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class MaintenanceServiceImpl extends BaseServiceImpl implements MaintenanceService { +public class MaintenanceServiceImpl extends ServiceImpl implements MaintenanceService { /** * 获取日常维护数量 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java index 9cfa208..211662c 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.scheduled.mapper.operation.PhenomenonMapper; import com.hnac.hzims.scheduled.service.operation.business.PhenomenonService; import lombok.AllArgsConstructor; 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.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class PhenomenonServiceImpl extends BaseServiceImpl implements PhenomenonService { +public class PhenomenonServiceImpl extends ServiceImpl implements PhenomenonService { /** * 消缺数量统计 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/GenerateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/GenerateService.java index 440ce60..f93219c 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/GenerateService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/GenerateService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.GenerateEntity; import com.hnac.hzims.operational.main.vo.GenerationPowerVo; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * @date 2023/04/10 11:16:07 * @version 4.0.0 */ -public interface GenerateService extends BaseService { +public interface GenerateService extends IService { // 查询填报用电量 Float generate(String date,String station); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OtherService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OtherService.java index 13ee8ab..55867bf 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OtherService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OtherService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OtherEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface OtherService extends BaseService { +public interface OtherService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverDetailsService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverDetailsService.java index efa4b86..d64cfa7 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverDetailsService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverDetailsService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface OverDetailsService extends BaseService { +public interface OverDetailsService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverService.java index d83b731..ef6ac21 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/OverService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OverEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface OverService extends BaseService { +public interface OverService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/PowerService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/PowerService.java index c26957a..70db475 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/PowerService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/PowerService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.PowerEntity; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface PowerService extends BaseService { +public interface PowerService extends IService { Double generate(String date,Long station); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/RainFallService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/RainFallService.java index 6e0f587..377ee13 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/RainFallService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/RainFallService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.RainfallEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface RainFallService extends BaseService { +public interface RainFallService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/SolveService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/SolveService.java index c3b8ee2..58c5705 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/SolveService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/SolveService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.SolveEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface SolveService extends BaseService { +public interface SolveService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/StorageService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/StorageService.java index a9d9825..f7d0eb5 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/StorageService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/StorageService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.StorageEntity; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -15,6 +16,6 @@ import java.util.List; /** * 接入电站历史发电量填报 */ -public interface StorageService extends BaseService { +public interface StorageService extends IService { List generateThreeYear(String start, String end, Long station); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/UseService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/UseService.java index 11be788..eff61dd 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/UseService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/UseService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.fill; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.UseEntity; import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.UseVo; import com.hnac.hzims.operational.main.vo.UsrPowerVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.Map; * @date 2023/04/10 11:16:07 * @version 4.0.0 */ -public interface UseService extends BaseService { +public interface UseService extends IService { // 查询填报用电量 Float use(String date,String station); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java index ef12a56..13d5e05 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.scheduled.service.operation.fill; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.WindEntity; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface WindService extends BaseService { +public interface WindService extends IService { List generateThreeYear(String start, String end, Long station); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/GenerateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/GenerateServiceImpl.java index 2ea51cc..55de84d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/GenerateServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/GenerateServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.scheduled.mapper.operation.GenerateMapper; import com.hnac.hzims.scheduled.service.operation.fill.GenerateService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class GenerateServiceImpl extends BaseServiceImpl implements GenerateService { +public class GenerateServiceImpl extends ServiceImpl implements GenerateService { /** * 根据时间、机构查询用电量 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OtherServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OtherServiceImpl.java index 11da8ed..1817091 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OtherServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OtherServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.OtherMapper; import com.hnac.hzims.scheduled.service.operation.fill.OtherService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class OtherServiceImpl extends BaseServiceImpl implements OtherService { +public class OtherServiceImpl extends ServiceImpl implements OtherService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverDetailsServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverDetailsServiceImpl.java index 18d3513..eb23ef0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverDetailsServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverDetailsServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.OverDetailsMapper; import com.hnac.hzims.scheduled.service.operation.fill.OverDetailsService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class OverDetailsServiceImpl extends BaseServiceImpl implements OverDetailsService { +public class OverDetailsServiceImpl extends ServiceImpl implements OverDetailsService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverServiceImpl.java index c009008..3530e78 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/OverServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.OverMapper; import com.hnac.hzims.scheduled.service.operation.fill.OverService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class OverServiceImpl extends BaseServiceImpl implements OverService { +public class OverServiceImpl extends ServiceImpl implements OverService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/PowerServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/PowerServiceImpl.java index b0028ca..f919978 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/PowerServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/PowerServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.scheduled.mapper.operation.PowerMapper; import com.hnac.hzims.scheduled.service.operation.fill.PowerService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class PowerServiceImpl extends BaseServiceImpl implements PowerService { +public class PowerServiceImpl extends ServiceImpl implements PowerService { /** diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/RainFallServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/RainFallServiceImpl.java index 459d2d9..78543fa 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/RainFallServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/RainFallServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.RainFallMapper; import com.hnac.hzims.scheduled.service.operation.fill.RainFallService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class RainFallServiceImpl extends BaseServiceImpl implements RainFallService { +public class RainFallServiceImpl extends ServiceImpl implements RainFallService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/SolveServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/SolveServiceImpl.java index 22f0b10..33f48e7 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/SolveServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/SolveServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.SolveMapper; import com.hnac.hzims.scheduled.service.operation.fill.SolveService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class SolveServiceImpl extends BaseServiceImpl implements SolveService { +public class SolveServiceImpl extends ServiceImpl implements SolveService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/StorageServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/StorageServiceImpl.java index fb5ccf9..1ba818e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/StorageServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/StorageServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.scheduled.mapper.operation.StorageMapper; import com.hnac.hzims.scheduled.service.operation.fill.StorageService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class StorageServiceImpl extends BaseServiceImpl implements StorageService { +public class StorageServiceImpl extends ServiceImpl implements StorageService { @Override public List generateThreeYear(String start, String end, Long station) { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/UseServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/UseServiceImpl.java index 58ba3dc..1b8cd9b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/UseServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/UseServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.scheduled.mapper.operation.UseMapper; import com.hnac.hzims.scheduled.service.operation.fill.UseService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class UseServiceImpl extends BaseServiceImpl implements UseService { +public class UseServiceImpl extends ServiceImpl implements UseService { /** * 根据时间、机构查询用电量 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java index 2a82ea5..96a7982 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.scheduled.mapper.operation.WindMapper; import com.hnac.hzims.scheduled.service.operation.fill.WindService; import lombok.AllArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class WindServiceImpl extends BaseServiceImpl implements WindService { +public class WindServiceImpl extends ServiceImpl implements WindService { @Override diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ModelStationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ModelStationService.java index 9d626b0..a1ab78b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ModelStationService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/ModelStationService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.operation.home; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface ModelStationService extends BaseService { +public interface ModelStationService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ModelStationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ModelStationServiceImpl.java index 19215c1..f19e237 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ModelStationServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ModelStationServiceImpl.java @@ -4,13 +4,13 @@ package com.hnac.hzims.scheduled.service.operation.home.impl; import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; import com.hnac.hzims.scheduled.mapper.operation.ModelStationMapper; import com.hnac.hzims.scheduled.service.operation.home.ModelStationService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * @author ysj */ @Service -public class ModelStationServiceImpl extends BaseServiceImpl implements ModelStationService { +public class ModelStationServiceImpl extends ServiceImpl implements ModelStationService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java index 106e0aa..cfc3996 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java @@ -39,7 +39,6 @@ import com.hnac.hzinfo.sdk.core.response.Result; import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient; import com.hnac.hzinfo.sdk.v5.device.dto.ReductionDataDTO; import com.hnac.hzinfo.sdk.v5.device.vo.ReductionDataVO; -import io.undertow.util.CopyOnWriteMap; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/RunMonService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/RunMonService.java index 546cbad..70b6ed7 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/RunMonService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/RunMonService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.operation.report; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.report.entity.RunMonthEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface RunMonService extends BaseService { +public interface RunMonService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/ReportServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/ReportServiceImpl.java index 843473d..3e5ebff 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/ReportServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/ReportServiceImpl.java @@ -671,7 +671,7 @@ public class ReportServiceImpl implements ReportService { if(CollectionUtil.isEmpty(runs)){ return; } - runMonService.deleteLogic(runs.stream().map(RunMonthEntity::getId).collect(Collectors.toList())); + runMonService.removeByIds(runs.stream().map(RunMonthEntity::getId).collect(Collectors.toList())); } /** diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/RunMonServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/RunMonServiceImpl.java index 561be44..fb1e7c6 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/RunMonServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/report/impl/RunMonServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.RunMonMapper; import com.hnac.hzims.scheduled.service.operation.report.RunMonService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @Slf4j -public class RunMonServiceImpl extends BaseServiceImpl implements RunMonService { +public class RunMonServiceImpl extends ServiceImpl implements RunMonService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttrConfigService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttrConfigService.java index 88e090d..66d43c5 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttrConfigService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttrConfigService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.operation.station; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface StationAttrConfigService extends BaseService { +public interface StationAttrConfigService extends IService { List getHideList(); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttributeService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttributeService.java index ea2bd01..f2f94e7 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttributeService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationAttributeService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.operation.station; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.StationAttributeEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.Map; /** * @author hx */ -public interface StationAttributeService extends BaseService { +public interface StationAttributeService extends IService { Map PointUnit(); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationService.java index 2ff95b0..d8bf38f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/StationService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.operation.station; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.StationEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface StationService extends BaseService { +public interface StationService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttrConfigServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttrConfigServiceImpl.java index ccb7340..6901fd0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttrConfigServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttrConfigServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; import com.hnac.hzims.scheduled.mapper.operation.StationAttrConfigMapper; import com.hnac.hzims.scheduled.service.operation.station.StationAttrConfigService; 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.springframework.stereotype.Service; @@ -18,7 +18,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class StationAttrConfigServiceImpl extends BaseServiceImpl implements StationAttrConfigService { +public class StationAttrConfigServiceImpl extends ServiceImpl implements StationAttrConfigService { @Override public List getHideList() { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttributeServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttributeServiceImpl.java index a9789e4..1711aea 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttributeServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationAttributeServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.scheduled.mapper.operation.StationAttributeMapper; import com.hnac.hzims.scheduled.service.operation.station.StationAttributeService; import lombok.RequiredArgsConstructor; 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.springframework.stereotype.Service; @@ -18,7 +18,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class StationAttributeServiceImpl extends BaseServiceImpl implements StationAttributeService { +public class StationAttributeServiceImpl extends ServiceImpl implements StationAttributeService { /** * 获取集中监控监测点单位 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationServiceImpl.java index b043c48..bbb5a27 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/station/impl/StationServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.operation.StationMapper; import com.hnac.hzims.scheduled.service.operation.station.StationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor @Slf4j @DS("master") -public class StationServiceImpl extends BaseServiceImpl implements StationService { +public class StationServiceImpl extends ServiceImpl implements StationService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java index ecdb769..5329bc3 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/CompanyService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.safeproduct; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface CompanyService extends BaseService { +public interface CompanyService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java index 0581c6f..1605bf4 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/InstanceService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.safeproduct; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity; -import org.springblade.core.mp.base.BaseService; + /** * Created by Sam Huang 2022/5/6 8:28 */ -public interface InstanceService extends BaseService { +public interface InstanceService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java index 5582515..e1daecc 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/MonthService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.scheduled.service.safeproduct; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.entity.CheckMonthEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.Map; /** * @author ysj */ -public interface MonthService extends BaseService { +public interface MonthService extends IService { Map check(Map map); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java index c472c89..9bb87a8 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/TrialService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.scheduled.service.safeproduct; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO; import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface TrialService extends BaseService { +public interface TrialService extends IService { int count(SafeEquipmentTrialDTO trial); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java index 9309b66..466e2f4 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/CompanyServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.safeproduct.CompanyMapper; import com.hnac.hzims.scheduled.service.safeproduct.CompanyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Slf4j @DS("safeproduct") -public class CompanyServiceImpl extends BaseServiceImpl implements CompanyService { +public class CompanyServiceImpl extends ServiceImpl implements CompanyService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java index 5fd57ad..3415c65 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/InstanceServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.mapper.safeproduct.InstanceMapper; import com.hnac.hzims.scheduled.service.safeproduct.InstanceService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Slf4j @DS("safeproduct") -public class InstanceServiceImpl extends BaseServiceImpl implements InstanceService { +public class InstanceServiceImpl extends ServiceImpl implements InstanceService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java index 50d245d..e28560f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/MonthServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.scheduled.service.safeproduct.MonthService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -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.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; @AllArgsConstructor @Slf4j @DS("safeproduct") -public class MonthServiceImpl extends BaseServiceImpl implements MonthService { +public class MonthServiceImpl extends ServiceImpl implements MonthService { private final CompanyService companyService; private final InstanceService instanceService; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java index 379fff7..aea9fba 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.scheduled.mapper.safeproduct.TrialMapper; import com.hnac.hzims.scheduled.service.safeproduct.TrialService; import lombok.RequiredArgsConstructor; 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.ObjectUtil; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.Optional; @Slf4j @RequiredArgsConstructor @DS("safeproduct") -public class TrialServiceImpl extends BaseServiceImpl implements TrialService { +public class TrialServiceImpl extends ServiceImpl implements TrialService { /** * 时间区间机构的设备实验数据查询 diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java index ad99144..52ba0b1 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketEvaluateService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.ticket; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface TicketEvaluateService extends BaseService { +public interface TicketEvaluateService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java index 63d5ceb..80db18f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/TicketService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.scheduled.service.ticket; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.time.LocalDateTime; @@ -12,7 +13,7 @@ import java.util.List; /** * @author ysj */ -public interface TicketService extends BaseService { +public interface TicketService extends IService { DoublePassRateVO doublePassRate(List areas, LocalDateTime firstDateTime, LocalDateTime now); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkDelayService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkDelayService.java index ec3ef3c..decf82d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkDelayService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkDelayService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.scheduled.service.ticket; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface WorkDelayService extends BaseService { +public interface WorkDelayService extends IService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkPrincipalService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkPrincipalService.java index b819667..28f63f3 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkPrincipalService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkPrincipalService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.scheduled.service.ticket; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface WorkPrincipalService extends BaseService { +public interface WorkPrincipalService extends IService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java index 9b1f4ac..a8e43ae 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/WorkTicketService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.scheduled.service.ticket; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketStatisticVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; import java.util.Map; @@ -10,6 +11,6 @@ import java.util.Map; /** * @author ysj */ -public interface WorkTicketService extends BaseService { +public interface WorkTicketService extends IService { WorkTicketStatisticVO work(String start, String end, List areas); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java index 253f645..fbd46f3 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketEvaluateServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.service.ticket.TicketEvaluateService; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor @Slf4j @DS("ticket") -public class TicketEvaluateServiceImpl extends BaseServiceImpl implements TicketEvaluateService { +public class TicketEvaluateServiceImpl extends ServiceImpl implements TicketEvaluateService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index 1e14051..73b783e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; import lombok.RequiredArgsConstructor; 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.springframework.stereotype.Service; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j @DS("ticket") -public class TicketServiceImpl extends BaseServiceImpl implements TicketService { +public class TicketServiceImpl extends ServiceImpl implements TicketService { private final WorkTicketService workTicketService; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkDelayServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkDelayServiceImpl.java index 0f0fb63..035a523 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkDelayServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkDelayServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.service.ticket.WorkDelayService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Slf4j @DS("ticket") -public class WorkDelayServiceImpl extends BaseServiceImpl implements WorkDelayService { +public class WorkDelayServiceImpl extends ServiceImpl implements WorkDelayService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkPrincipalServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkPrincipalServiceImpl.java index 427f272..25d1654 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkPrincipalServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkPrincipalServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.scheduled.service.ticket.WorkPrincipalService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -17,6 +17,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Slf4j @DS("ticket") -public class WorkPrincipalServiceImpl extends BaseServiceImpl implements WorkPrincipalService { +public class WorkPrincipalServiceImpl extends ServiceImpl implements WorkPrincipalService { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java index c7638d1..7668df0 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketStatisticVO; import lombok.AllArgsConstructor; 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.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Slf4j @AllArgsConstructor @DS("ticket") -public class WorkTicketServiceImpl extends BaseServiceImpl implements WorkTicketService { +public class WorkTicketServiceImpl extends ServiceImpl implements WorkTicketService { private final WorkPrincipalService workPrincipalService; private final WorkDelayService workDelayService; diff --git a/hzims-service/hzims-scheduled/src/main/resources/template/template.yml b/hzims-service/hzims-scheduled/src/main/resources/template/template.yml new file mode 100644 index 0000000..84e2b06 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/resources/template/template.yml @@ -0,0 +1,116 @@ +#服务器端口 +server: + port: 8101 + + +#数据源配置 +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_operation?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} + equipment: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + ticket: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_ticket?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + safeproduct: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + inspect: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?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} + basic: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + alarm: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_alarm?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${${hzinfo.db.busines.username}.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.scheduled + +xxl: + job: + accessToken: '' + admin: + addresses: http://192.168.60.29:7009/xxl-job-admin + executor: + appname: hzims-scheduled + ip: 172.31.0.12 + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 7 + port: 28101 + +hzims: + equipment: + emInfo: + emInfoList: hzims:equipment:emInfo:deviceCode.emInfoList + fdp: + redisData: hzims:equipment:fdp:fault.data.realIdAndValueList + greaterThan: 0.3 + lessThan: 0.9 + beEqualOrGreaterThan: 0.9 + operation: + realIdKey: hzims:operation:comprehensiveD:realIdKey.realData + realIdKeyGather: hzims:operation:comprehensiveD:realIdKeyGather.realData + monitor: + station: hzims:operation:monitor:station + realId : hzims:operation:monitor:realId + region: + areaDutyInfoKey: hzims:operation:region:areaDutyInfoKey + deviceClassifyKey: hzims.operation.region.deviceClassifyKey + homePage: + charge: + url: https://www.hznychh.cn/api/charging-manage/manage/external/provide?secretKey=f5aee9fe24e4d1d80eb7564414392bc3 + area: + report: hzims.operation.area.report + wind: + report: hzims.operation.wind.report + energy: + report: hzims.operation.energy.report +blade: + mqtt: + url: tcp://192.168.60.29:1883 + group: hzims-alarm + username: admin + password: hzims@emqx + data: + sdk: + enabled: true + url: http://192.168.60.29/api/hzinfo-data-config + ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler + appId: '1635888805125099521' + appSecret: f4b6a4dc696b36445d2e5d38bbab2417 + redisIp: 192.168.60.29 + redisPort: 3577 + password: 1qaz2WSX@redis + maxKeys: 1000 \ No newline at end of file diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/InspectApplication.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/InspectApplication.java index 1aeb6c1..bfa9656 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/InspectApplication.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/InspectApplication.java @@ -3,10 +3,12 @@ package com.hnac.hzinfo.inspect; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.server.WebServerFactory; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; /** @@ -14,18 +16,19 @@ import org.springframework.context.annotation.ComponentScan; * * @author ninglong */ +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) -@SpringCloudApplication() @MapperScan({"org.springblade.**.mapper.**","com.hnac.**.mapper.**"}) @ComponentScan(basePackages = {"com.hnac"}) -public class InspectApplication extends SpringBootServletInitializer { +public class InspectApplication { public static void main(String[] args) { BladeApplication.run(Constants.APP_NAME, InspectApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(Constants.APP_NAME,InspectApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(Constants.APP_NAME,InspectApplication.class); +// } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java index 93bb4e5..19277cb 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/CameraInfoController.java @@ -166,7 +166,7 @@ public class CameraInfoController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(cameraInfoService.deleteLogic(Func.toLongList(ids))); + return R.status(cameraInfoService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java index c3d1b9d..ef824f9 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java @@ -104,7 +104,7 @@ public class ClockController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(st_clockService.deleteLogic(Func.toLongList(ids))); + return R.status(st_clockService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java index 54eaeb0..285a4c6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java @@ -102,7 +102,7 @@ public class ClockTypeController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(st_clock_typeService.deleteLogic(Func.toLongList(ids))); + return R.status(st_clock_typeService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskController.java index e0ca260..b4b0e78 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskController.java @@ -9,7 +9,7 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; import lombok.SneakyThrows; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.oss.OssTemplate; @@ -41,8 +41,8 @@ public class RobotTaskController extends BladeController { private final IRobotTaskService robot_taskService; private final OssTemplate ossTemplate; - @Autowired - BladeLogger logger; +// @Autowired +// BladeLogger logger; /** @@ -118,7 +118,7 @@ public class RobotTaskController extends BladeController { @ApiOperationSupport(order = 8) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R removeLogic(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(robot_taskService.deleteLogic(Func.toLongList(ids))); + return R.status(robot_taskService.removeByIds(Func.toLongList(ids))); } /** @@ -168,7 +168,7 @@ public class RobotTaskController extends BladeController { @ApiOperation(value = "处理机器人巡检结果", notes = "传入文件") public R putFile(@ApiParam(value = "文件", required = true) @RequestParam MultipartFile file, @ApiParam(value = "其他参数，标准json格式", required = true) @RequestParam String jsonPara) { - logger.info("RobotTaskController-put-file-more", jsonPara); + robot_taskService.analysisAIReturn(file, jsonPara); return R.success("操作成功"); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskIdentifyController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskIdentifyController.java index e0db207..8565a6a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskIdentifyController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotTaskIdentifyController.java @@ -95,7 +95,7 @@ public class RobotTaskIdentifyController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(robot_task_identifyService.deleteLogic(Func.toLongList(ids))); + return R.status(robot_task_identifyService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/UserFaceDataController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/UserFaceDataController.java index 87af7c2..84c2757 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/UserFaceDataController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/UserFaceDataController.java @@ -100,7 +100,7 @@ public class UserFaceDataController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(stFaceDataService.deleteLogic(Func.toLongList(ids))); + return R.status(stFaceDataService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/ICameraInfoService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/ICameraInfoService.java index 4689902..d2f0bbc 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/ICameraInfoService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/ICameraInfoService.java @@ -1,14 +1,15 @@ package com.hnac.hzinfo.inspect.ai.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.entity.CameraInfoEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface ICameraInfoService extends BaseService { +public interface ICameraInfoService extends IService { void testSms(); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockService.java index ed0a0c0..a9fb107 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.ai.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.vo.ClockVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.ai.entity.ClockEntity; /** @@ -10,7 +11,7 @@ import com.hnac.hzinfo.inspect.ai.entity.ClockEntity; * * @author py */ -public interface IClockService extends BaseService { +public interface IClockService extends IService { /** * 获取表详细信息 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockTypeService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockTypeService.java index d0de9a8..1b65259 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockTypeService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IClockTypeService.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.ai.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.entity.ClockTypeEntity; /** @@ -8,6 +9,6 @@ import com.hnac.hzinfo.inspect.ai.entity.ClockTypeEntity; * * @author Chill */ -public interface IClockTypeService extends BaseService { +public interface IClockTypeService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotService.java index ca7fc40..629d91c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotService.java @@ -1,12 +1,13 @@ package com.hnac.hzinfo.inspect.ai.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.inspect.ai.dto.robot.RobotInstanceDTO; import com.hnac.hzinfo.inspect.ai.vo.RobotVO; import com.hnac.hzinfo.inspect.ai.vo.robot.RobotRealDataVO; import com.hnac.hzinfo.sdk.v5.device.vo.VirtualDeviceDTO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.ai.entity.RobotEntity; import org.springblade.core.mp.support.Query; @@ -18,7 +19,7 @@ import java.util.Map; * * @author */ -public interface IRobotService extends BaseService { +public interface IRobotService extends IService { /** * 根据用户id 获取 机器人信息 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskIdentifyService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskIdentifyService.java index dc9aae4..297eb41 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskIdentifyService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskIdentifyService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.ai.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; /** @@ -9,7 +10,7 @@ import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; * * @author Chill */ -public interface IRobotTaskIdentifyService extends BaseService { +public interface IRobotTaskIdentifyService extends IService { /** * 获取详情（含content 详情） diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskService.java index b3aefc3..f2a672b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IRobotTaskService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.ai.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.vo.RobotTaskVO; import com.hnac.hzinfo.inspect.ai.vo.robot.RobotTaskTransParam; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.ai.entity.RobotTaskEntity; import org.springframework.web.multipart.MultipartFile; @@ -14,7 +15,7 @@ import java.util.Map; * * @author Chill */ -public interface IRobotTaskService extends BaseService { +public interface IRobotTaskService extends IService { /** * 获取项目已被选择内容 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IUserFaceDataService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IUserFaceDataService.java index cba46ce..f88f068 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IUserFaceDataService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IUserFaceDataService.java @@ -1,14 +1,15 @@ package com.hnac.hzinfo.inspect.ai.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author py */ -public interface IUserFaceDataService extends BaseService { +public interface IUserFaceDataService extends IService { /** * 保存 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java index 1c6a7e0..bcd548f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzinfo.inspect.ai.mapper.CameraInfoMapper; import com.hnac.hzinfo.inspect.ai.service.ICameraInfoService; import lombok.AllArgsConstructor; 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.sms.model.SmsResponse; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class CameraInfoServiceImpl extends BaseServiceImpl implements ICameraInfoService { +public class CameraInfoServiceImpl extends ServiceImpl implements ICameraInfoService { @Autowired private ISmsClient smsClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockServiceImpl.java index 1502e59..6f33368 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzinfo.inspect.ai.service.ICameraInfoService; import com.hnac.hzinfo.inspect.ai.service.IClockTypeService; import com.hnac.hzinfo.inspect.ai.vo.ClockVO; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.ai.entity.ClockEntity; import com.hnac.hzinfo.inspect.ai.mapper.ClockMapper; import com.hnac.hzinfo.inspect.ai.service.IClockService; @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; */ @Service @AllArgsConstructor -public class ClockServiceImpl extends BaseServiceImpl implements IClockService { +public class ClockServiceImpl extends ServiceImpl implements IClockService { private IClockTypeService typeService; private ICameraInfoService cameraInfoClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockTypeServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockTypeServiceImpl.java index fc2ed1c..f9454c2 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockTypeServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ClockTypeServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.ai.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.ai.entity.ClockTypeEntity; import com.hnac.hzinfo.inspect.ai.mapper.ClockTypeMapper; import com.hnac.hzinfo.inspect.ai.service.IClockTypeService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author */ @Service -public class ClockTypeServiceImpl extends BaseServiceImpl implements IClockTypeService { +public class ClockTypeServiceImpl extends ServiceImpl implements IClockTypeService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotServiceImpl.java index aa30f6b..95f4603 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotServiceImpl.java @@ -29,7 +29,7 @@ import com.hnac.hzinfo.sdk.v5.device.vo.VirtualDeviceDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.ai.entity.RobotEntity; import com.hnac.hzinfo.inspect.ai.mapper.RobotMapper; import com.hnac.hzinfo.inspect.ai.service.IRobotService; @@ -59,7 +59,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class RobotServiceImpl extends BaseServiceImpl implements IRobotService { +public class RobotServiceImpl extends ServiceImpl implements IRobotService { private final DeviceClient deviceClient; private final IAnalyseDataSearchClient analyseDataSearchClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskIdentifyServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskIdentifyServiceImpl.java index 3f18bdd..189eb1d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskIdentifyServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskIdentifyServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzinfo.inspect.ai.AIContants; import com.hnac.hzinfo.inspect.ai.vo.RobotTaskIdentifyVO; import com.hnac.hzinfo.inspect.obj.services.ContentService; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; import com.hnac.hzinfo.inspect.ai.mapper.RobotTaskIdentifyMapper; import com.hnac.hzinfo.inspect.ai.service.IRobotTaskIdentifyService; @@ -21,7 +21,7 @@ import java.util.Arrays; */ @Service @AllArgsConstructor -public class RobotTaskIdentifyServiceImpl extends BaseServiceImpl implements IRobotTaskIdentifyService { +public class RobotTaskIdentifyServiceImpl extends ServiceImpl implements IRobotTaskIdentifyService { private final ContentService contentService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java index e2912b5..d8f0ff4 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java @@ -28,10 +28,9 @@ import com.hnac.hzinfo.inspect.task.service.ITaskUserService; import com.hnac.hzinfo.inspect.task.vo.EventAddVO; import com.hnac.hzinfo.inspect.task.vo.EventRecordAddVO; import com.hnac.hzinfo.inspect.task.vo.TaskVo; -import jodd.util.ArraysUtil; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.mp.base.BaseServiceImpl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.ai.entity.RobotTaskEntity; import com.hnac.hzinfo.inspect.ai.mapper.RobotTaskMapper; import com.hnac.hzinfo.inspect.ai.service.IRobotTaskService; @@ -57,7 +56,7 @@ import java.util.*; * @author py */ @Service -public class RobotTaskServiceImpl extends BaseServiceImpl implements IRobotTaskService { +public class RobotTaskServiceImpl extends ServiceImpl implements IRobotTaskService { @Autowired ContentService contentService; @@ -79,8 +78,6 @@ public class RobotTaskServiceImpl extends BaseServiceImpl floatList = new ArrayList<>(); + for (float value : floats) { + floatList.add(value); + } + max = Collections.max(floatList); /** 图片 */ byte[] picTemp = new byte[ints[3]]; @@ -706,7 +708,7 @@ public class RobotTaskServiceImpl extends BaseServiceImpl> getInspectConclusion(Map params); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/IRouteGatherService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/IRouteGatherService.java index 6fd4486..601bd30 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/IRouteGatherService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/IRouteGatherService.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.gather.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.gather.entity.RouteGatherEntity; /** @@ -8,6 +9,6 @@ import com.hnac.hzinfo.inspect.gather.entity.RouteGatherEntity; * * @author Chill */ -public interface IRouteGatherService extends BaseService { +public interface IRouteGatherService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/ITaskGatherService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/ITaskGatherService.java index 3498793..be39b90 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/ITaskGatherService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/ITaskGatherService.java @@ -1,9 +1,10 @@ package com.hnac.hzinfo.inspect.gather.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.gather.vo.TaskGatherQueryVO; import com.hnac.hzinfo.inspect.gather.vo.TaskGatherReportVO; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.gather.entity.TaskGatherEntity; import java.util.List; @@ -14,7 +15,7 @@ import java.util.Map; * * @author Chill */ -public interface ITaskGatherService extends BaseService { +public interface ITaskGatherService extends IService { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/RouteGatherServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/RouteGatherServiceImpl.java index d42de74..36ec32e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/RouteGatherServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/RouteGatherServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.gather.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.gather.entity.RouteGatherEntity; import com.hnac.hzinfo.inspect.gather.mapper.RouteGatherMapper; import com.hnac.hzinfo.inspect.gather.service.IRouteGatherService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class RouteGatherServiceImpl extends BaseServiceImpl implements IRouteGatherService { +public class RouteGatherServiceImpl extends ServiceImpl implements IRouteGatherService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/TaskGatherServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/TaskGatherServiceImpl.java index 64bc27c..5da63a4 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/TaskGatherServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/gather/service/impl/TaskGatherServiceImpl.java @@ -2,7 +2,7 @@ package com.hnac.hzinfo.inspect.gather.service.impl; import com.hnac.hzinfo.inspect.gather.vo.TaskGatherQueryVO; import com.hnac.hzinfo.inspect.gather.vo.TaskGatherReportVO; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.gather.entity.TaskGatherEntity; import com.hnac.hzinfo.inspect.gather.mapper.TaskGatherMapper; import com.hnac.hzinfo.inspect.gather.service.ITaskGatherService; @@ -18,7 +18,7 @@ import java.util.Map; * @author Chill */ @Service -public class TaskGatherServiceImpl extends BaseServiceImpl implements ITaskGatherService { +public class TaskGatherServiceImpl extends ServiceImpl implements ITaskGatherService { @Autowired private TaskGatherMapper taskGatherMapper; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java index f26b2e6..4d432b4 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java @@ -9,9 +9,7 @@ import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; import com.hnac.hzinfo.inspect.obj.vo.ContentDefinitionVO; import com.hnac.hzinfo.inspect.obj.wrapper.ContentDefinitionWrapper; import lombok.AllArgsConstructor; -import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import oracle.jdbc.proxy.annotation.Post; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java index 2577317..be35522 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java @@ -1,10 +1,7 @@ package com.hnac.hzinfo.inspect.obj.feign; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzinfo.inspect.obj.dto.ContentDTO; import com.hnac.hzinfo.inspect.obj.dto.ProjectDTO; import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; @@ -12,7 +9,6 @@ import com.hnac.hzinfo.inspect.obj.request.ProjectContentRequest; import com.hnac.hzinfo.inspect.obj.services.ProjectContentService; import com.hnac.hzinfo.inspect.obj.services.ProjectService; import com.hnac.hzinfo.inspect.obj.vo.ProjectVO; -import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; @@ -59,7 +55,7 @@ public class ProjectClient extends BladeController implements IProjectClient { @Override @GetMapping(GET_EM_CODES_BY_DEPT_ID) - public R> getEmCodesByDeptId(@RequestParam Long deptId) { + public R> getEmCodesByDeptId(@RequestParam("deptId") Long deptId) { QueryWrapper queryWrapper = Wrappers.query().eq("create_dept", deptId); queryWrapper.ne("em_code","").isNotNull("em_code"); List projects = projectService.list(queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ContentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ContentService.java index fdddabf..7be9e3d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ContentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ContentService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.obj.services; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; import java.util.List; @@ -11,6 +12,6 @@ import java.util.List; * created in 2018/9/04 16:09 * modified By: */ -public interface ContentService extends BaseService { +public interface ContentService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java index 9960a71..1575eaf 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java @@ -2,19 +2,20 @@ package com.hnac.hzinfo.inspect.obj.services; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.common.utils.Condition; import com.hnac.hzinfo.inspect.obj.dto.ContentDefinitionDTO; import com.hnac.hzinfo.inspect.obj.entity.ContentDefinitionEntity; import com.hnac.hzinfo.inspect.obj.vo.ContentDefinitionVO; import net.bytebuddy.matcher.BooleanMatcher; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -public interface IContentDefinitionService extends BaseService { +public interface IContentDefinitionService extends IService { Boolean removeByIds(String ids); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java index 5a0c8fa..5ed5657 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.obj.entity.ObjectDangerEntity; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * * @author Chill */ -public interface IObjectDangerService extends BaseService { +public interface IObjectDangerService extends IService { /** * 获取危险点详情 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectService.java index 75be494..0b91d4d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectService.java @@ -1,9 +1,10 @@ package com.hnac.hzinfo.inspect.obj.services; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.vo.ObjectExcelInputVo; import com.hnac.hzinfo.inspect.obj.vo.ObjectOfflineVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; @@ -12,7 +13,7 @@ import java.util.List; /** * 巡检对象dao */ -public interface ObjectService extends BaseService { +public interface ObjectService extends IService { /** * 分页获取对象信息 * @param page diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectTemplateService.java index c84dcad..80df33a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectTemplateService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.vo.TemplateAddVo; import com.hnac.hzinfo.inspect.obj.vo.TemplateProjectVo; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity; @@ -13,7 +14,7 @@ import java.util.List; * * modified By: */ -public interface ObjectTemplateService extends BaseService{ +public interface ObjectTemplateService extends IService { /** * 新增模板，或者修改模板。连同模板项目绑定 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectUserService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectUserService.java index af1b9ca..1905c5f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectUserService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ObjectUserService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; import com.hnac.hzinfo.inspect.obj.vo.ObjectUserListQuery; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface ObjectUserService extends BaseService { +public interface ObjectUserService extends IService { List getPageList(ObjectUserListQuery user); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/OtherObjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/OtherObjectService.java index 290624e..2b59895 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/OtherObjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/OtherObjectService.java @@ -1,16 +1,17 @@ package com.hnac.hzinfo.inspect.obj.services; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; import com.hnac.hzinfo.inspect.obj.entity.OtherObjectEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * 巡检对象dao */ -public interface OtherObjectService extends BaseService { +public interface OtherObjectService extends IService { /** * 获取其他对象来源类型 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectContentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectContentService.java index 2f20e2a..b70cf39 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectContentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectContentService.java @@ -1,10 +1,11 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; @@ -13,7 +14,7 @@ import java.util.List; /** * 巡检项目内容service */ -public interface ProjectContentService extends BaseService{ +public interface ProjectContentService extends IService { boolean saveOrUpdateProjectContent(List list); /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectService.java index ea4c63b..72fa80b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/ProjectService.java @@ -4,11 +4,12 @@ package com.hnac.hzinfo.inspect.obj.services; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.dto.ContentDTO; import com.hnac.hzinfo.inspect.obj.dto.ProjectDTO; import com.hnac.hzinfo.inspect.obj.vo.ProjectOfflineVO; import com.hnac.hzinfo.inspect.obj.vo.ProjectVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import org.springblade.core.mp.support.Query; @@ -16,7 +17,7 @@ import org.springblade.core.mp.support.Query; /** * 巡检项目service */ -public interface ProjectService extends BaseService{ +public interface ProjectService extends IService { List getProjectData(String tenantId); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateProjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateProjectService.java index 3dcb562..6cf49c7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateProjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateProjectService.java @@ -1,18 +1,19 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; import com.hnac.hzinfo.inspect.obj.vo.TemplateAddVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * 巡检模板项目service */ -public interface TemplateProjectService extends BaseService{ +public interface TemplateProjectService extends IService { /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateService.java index 3bcf0ac..4542700 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/TemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.obj.services; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author Chill */ -public interface TemplateService extends BaseService { +public interface TemplateService extends IService { /** * 获取所有包含项目的内容(不分页) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentDefinitionServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentDefinitionServiceImpl.java index 2a66c37..2198014 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentDefinitionServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentDefinitionServiceImpl.java @@ -14,8 +14,8 @@ import com.hnac.hzinfo.inspect.obj.wrapper.ContentDefinitionWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.base.BaseService; -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.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -40,7 +40,7 @@ import java.util.Optional; @Service @AllArgsConstructor @Slf4j -public class ContentDefinitionServiceImpl extends BaseServiceImpl +public class ContentDefinitionServiceImpl extends ServiceImpl implements IContentDefinitionService { private final IEmTreeInspectClient emTreeInspectClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentServiceImpl.java index 88743a2..28b044a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.obj.services.impl; import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler; import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * modified By: */ @Service -public class ContentServiceImpl extends BaseServiceImpl implements ContentService, DatabaseCopyHandler { +public class ContentServiceImpl extends ServiceImpl implements ContentService, DatabaseCopyHandler { @Override public boolean saveBatch(Collection entityList, int batchSize) { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java index 2e12126..438cc44 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.obj.entity.ObjectDangerEntity; import com.hnac.hzinfo.inspect.obj.mapper.ObjectDangerMapper; import com.hnac.hzinfo.inspect.obj.services.IObjectDangerService; @@ -20,7 +20,7 @@ import java.util.List; */ @Service @AllArgsConstructor -public class ObjectDangerServiceImpl extends BaseServiceImpl implements IObjectDangerService { +public class ObjectDangerServiceImpl extends ServiceImpl implements IObjectDangerService { private IDangerSourceClient sourceClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java index 5da4160..339ec98 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzinfo.inspect.utils.HtmlModule; import com.hnac.hzinfo.inspect.utils.HtmltoPdf; import com.hnac.hzinfo.inspect.utils.ZxingGenCode; 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.tool.api.R; import org.springblade.core.tool.utils.*; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +45,7 @@ import java.util.stream.Stream; * modified By: */ @Service -public class ObjectServiceImpl extends BaseServiceImpl implements ObjectService { +public class ObjectServiceImpl extends ServiceImpl implements ObjectService { @Autowired private TemplateService templateService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectTemplateServiceImpl.java index c47fdcb..ed21df8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectTemplateServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzinfo.inspect.obj.vo.TemplateAddVo; import com.hnac.hzinfo.inspect.obj.vo.TemplateProjectVo; import lombok.AllArgsConstructor; 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.tool.utils.Func; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +28,7 @@ import java.util.List; */ @Service @AllArgsConstructor -public class ObjectTemplateServiceImpl extends BaseServiceImpl implements ObjectTemplateService { +public class ObjectTemplateServiceImpl extends ServiceImpl implements ObjectTemplateService { private TemplateProjectService templateProjectService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java index def9645..12cdc0a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzinfo.inspect.obj.mapper.ObjectUserMapper; import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; import com.hnac.hzinfo.inspect.obj.services.ObjectUserService; import com.hnac.hzinfo.inspect.obj.vo.ObjectUserListQuery; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; * @author Chill */ @Service -public class ObjectUserServiceImpl extends BaseServiceImpl implements ObjectUserService { +public class ObjectUserServiceImpl extends ServiceImpl implements ObjectUserService { @Override public List getPageList(ObjectUserListQuery user){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/OtherObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/OtherObjectServiceImpl.java index 5faa943..2c53a41 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/OtherObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/OtherObjectServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzinfo.inspect.obj.entity.OtherObjectEntity; import com.hnac.hzinfo.inspect.obj.mapper.InspectOtherObjectMapper; import com.hnac.hzinfo.inspect.obj.services.OtherObjectService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; * modified By: */ @Service -public class OtherObjectServiceImpl extends BaseServiceImpl implements OtherObjectService { +public class OtherObjectServiceImpl extends ServiceImpl implements OtherObjectService { /** * 获取其他对象来源类型 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectContentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectContentServiceImpl.java index 11686c0..cb84922 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectContentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectContentServiceImpl.java @@ -16,7 +16,7 @@ import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; import com.hnac.hzinfo.inspect.plan.PlanContants; import lombok.AllArgsConstructor; 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.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; @@ -33,7 +33,7 @@ import java.util.Map; @Service @AllArgsConstructor @Slf4j -public class ProjectContentServiceImpl extends BaseServiceImpl implements ProjectContentService, DatabaseCopyHandler { +public class ProjectContentServiceImpl extends ServiceImpl implements ProjectContentService, DatabaseCopyHandler { private ProjectService projectService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java index beda076..b3725f8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java @@ -27,7 +27,7 @@ import com.hnac.hzinfo.inspect.utils.Condition; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -45,7 +45,7 @@ import java.util.stream.Stream; @Service @AllArgsConstructor @Slf4j -public class ProjectServiceImpl extends BaseServiceImpl implements ProjectService { +public class ProjectServiceImpl extends ServiceImpl implements ProjectService { private final ContentService contentService; private final ISysClient sysClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateProjectServiceImpl.java index 16992a7..c977897 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateProjectServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzinfo.inspect.obj.services.TemplateService; import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,7 +22,7 @@ import java.util.List; */ @Service @AllArgsConstructor -public class TemplateProjectServiceImpl extends BaseServiceImpl implements TemplateProjectService, DatabaseCopyHandler { +public class TemplateProjectServiceImpl extends ServiceImpl implements TemplateProjectService, DatabaseCopyHandler { private ProjectContentServiceImpl projectContentService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateServiceImpl.java index 957529f..f7e2f03 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/TemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.obj.services.impl; import com.hnac.hzinfo.inspect.obj.mapper.TemplateMapper; import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; import com.hnac.hzinfo.inspect.obj.services.TemplateService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; * @author Chill */ @Service -public class TemplateServiceImpl extends BaseServiceImpl implements TemplateService { +public class TemplateServiceImpl extends ServiceImpl implements TemplateService { /** * 获取所有包含项目的内容(不分页) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java index 10cd1da..659d8e7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java @@ -111,7 +111,7 @@ public class ContentController { if(count>0) { return R.fail("该巡检内容已被巡检项目引用，无法删除。"); } - return R.status(contentService.deleteLogic(delIdList)); + return R.status(contentService.removeByIds(delIdList)); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java index 565f0b7..668c872 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java @@ -180,7 +180,7 @@ public class ObjectController extends BladeController { eq("OBJECT_ID",aLong); }}); } - return R.status(objectService.deleteLogic(delIdList)); + return R.status(objectService.removeByIds(delIdList)); } @GetMapping("/disableOrEnable") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectTemplateController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectTemplateController.java index b43bfd7..b9c51ec 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectTemplateController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectTemplateController.java @@ -13,7 +13,6 @@ import com.hnac.hzinfo.log.annotation.Operate; import com.hnac.hzinfo.log.contants.BusinessType; import com.hnac.hzinfo.log.contants.Risk; import io.swagger.annotations.*; -import oracle.jdbc.proxy.annotation.Post; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; @@ -110,7 +108,7 @@ public class ObjectTemplateController { @ApiOperation(value = "删除对象模板", notes = "传入ids集合") @Operate(label="批量删除绑定对象的模板",type = BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) public R deleteObjectTemplate(@RequestParam String ids){ - return R.status(objectTemplateService.deleteLogic(Func.toLongList(ids))); + return R.status(objectTemplateService.removeByIds(Func.toLongList(ids))); } @GetMapping("/getTemplatesByObjectId") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java index 64fe5ba..fcbbd63 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java @@ -125,7 +125,7 @@ public class ObjectUserController { @ApiOperation(value = "删除", notes = "传入id集合") public R remove(@RequestParam String ids) { List delIdList = Func.toLongList(ids); - return R.status(objectUserService.deleteLogic(delIdList)); + return R.status(objectUserService.removeByIds(delIdList)); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectContentController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectContentController.java index 5b4c231..11f5d90 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectContentController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectContentController.java @@ -86,7 +86,7 @@ public class ProjectContentController { @GetMapping("/deleteProjectContent") @ApiOperation(value = "删除项目巡检内容", notes = "传入ids集合") public R deleteProjectContent(@RequestParam String ids){ - return R.status(projectContentService.deleteLogic(Func.toLongList(ids))); + return R.status(projectContentService.removeByIds(Func.toLongList(ids))); } @PostMapping("/submit-hld") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java index 2e2aabd..313214c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java @@ -130,13 +130,13 @@ public class ProjectController { if(count>0) { return R.fail("该巡检项目已被巡检模板引用，无法删除。"); } - projectService.deleteLogic(delIdList); + projectService.removeByIds(delIdList); //删除项目关联内容 List contentList = projectContentService.list(new LambdaQueryWrapper(){{ in(ProjectContentEntity::getProjectId,delIdList); }}); if(CollectionUtil.isNotEmpty(contentList)) { - projectContentService.deleteLogic(contentList.stream().map(ProjectContentEntity::getId).collect(Collectors.toList())); + projectContentService.removeByIds(contentList.stream().map(ProjectContentEntity::getId).collect(Collectors.toList())); } return R.success("删除成功！"); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java index ce825f5..298e9fc 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java @@ -145,9 +145,9 @@ public class TemplateController extends BladeController { in(TemplateProjectEntity::getTemplateId, Arrays.asList(ids.split(","))); }}); if(CollectionUtil.isNotEmpty(templateProjectEntityList)){ - templateProjectService.deleteLogic(templateProjectEntityList.stream().map(TemplateProjectEntity::getId).collect(Collectors.toList())); + templateProjectService.removeByIds(templateProjectEntityList.stream().map(TemplateProjectEntity::getId).collect(Collectors.toList())); } - return R.status(templateService.deleteLogic(Func.toLongList(ids))); + return R.status(templateService.removeByIds(Func.toLongList(ids))); } @GetMapping("/getAllContainProjectOfTemplate") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateProjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateProjectController.java index c233587..b1200d0 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateProjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateProjectController.java @@ -3,20 +3,13 @@ */ package com.hnac.hzinfo.inspect.obj.web; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; + import com.google.common.collect.Lists; -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; import com.hnac.hzinfo.inspect.obj.services.TemplateProjectService; -import com.hnac.hzinfo.inspect.obj.services.TemplateService; -import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; -import com.hnac.hzinfo.inspect.obj.vo.TemplateAddVo; import io.swagger.annotations.*; -import oracle.jdbc.proxy.annotation.Post; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -92,7 +85,7 @@ public class TemplateProjectController { @PostMapping("/deleteTemplateProject") @ApiOperation(value = "删除模板巡检项目", notes = "传入ids集合") public R deleteTemplateProject(@RequestParam String ids){ - return R.status(templateProjectService.deleteLogic(Func.toLongList(ids))); + return R.status(templateProjectService.removeByIds(Func.toLongList(ids))); } @GetMapping("/getPrjAndContents-hld") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineRecordService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineRecordService.java index c04e972..4ac221e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineRecordService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineRecordService.java @@ -1,10 +1,11 @@ package com.hnac.hzinfo.inspect.offline.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.offline.dto.OfflineRecordDTO; import com.hnac.hzinfo.inspect.offline.entity.OfflineRecordEntity; import com.hnac.hzinfo.inspect.offline.vo.OfflineRecordVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-06-11 11:30 **/ -public interface IOfflineRecordService extends BaseService { +public interface IOfflineRecordService extends IService { R doSave(OfflineRecordDTO req); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineTaskService.java index 7353171..5562a97 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineTaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/IOfflineTaskService.java @@ -1,11 +1,12 @@ package com.hnac.hzinfo.inspect.offline.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.offline.entity.OfflineTaskEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface IOfflineTaskService extends BaseService { +public interface IOfflineTaskService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java index 959ac38..69eb883 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java @@ -1,6 +1,8 @@ package com.hnac.hzinfo.inspect.offline.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.vo.DeviceVO; import com.hnac.hzims.operational.defect.feign.IOperFaultClient; @@ -37,10 +39,10 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; + import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.oss.model.BladeFile; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -854,7 +856,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { * @param data */ @Transactional(rollbackFor = Exception.class) - public void updateData(BaseService service, List data) { + public void updateData(IService service, List data) { try{ if (CollectionUtil.isEmpty(data)) { return; @@ -870,7 +872,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { } //删除 if (CollectionUtil.isNotEmpty(dataList.get(3))) { - service.deleteLogic(dataList.get(3).stream().map(SyncBO::getPrimaryKey).collect(Collectors.toList())); + service.removeByIds(dataList.get(3).stream().map(SyncBO::getPrimaryKey).collect(Collectors.toList())); } }catch (Exception exception){ log.error("offline_update_data : {}",exception.getMessage()); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OffLineServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OffLineServiceImpl.java index e1625e4..b57a7a3 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OffLineServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OffLineServiceImpl.java @@ -3,6 +3,8 @@ package com.hnac.hzinfo.inspect.offline.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.vo.DeviceVO; @@ -37,8 +39,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.lang.StringUtils; -import org.springblade.core.mp.base.BaseService; + + import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -382,7 +384,7 @@ public class OffLineServiceImpl implements IOffLineService { * @param data */ @Transactional(rollbackFor = Exception.class) - public void updateData(BaseService service, List data) { + public void updateData(IService service, List data) { if (CollectionUtil.isEmpty(data)) { return; } @@ -398,7 +400,7 @@ public class OffLineServiceImpl implements IOffLineService { } //新增 if (CollectionUtil.isNotEmpty(dataList.get(3))) { - service.deleteLogic(dataList.get(3).stream().map(SyncBO::getPrimaryKey).collect(Collectors.toList())); + service.removeByIds(dataList.get(3).stream().map(SyncBO::getPrimaryKey).collect(Collectors.toList())); } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineRecordServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineRecordServiceImpl.java index 8bbb409..dd3fa3c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineRecordServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineRecordServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzinfo.inspect.offline.mapper.OfflineRecordMapper; import com.hnac.hzinfo.inspect.offline.service.IOfflineRecordService; import com.hnac.hzinfo.inspect.offline.vo.OfflineRecordVO; import com.hnac.hzinfo.inspect.offline.wrapper.OfflineRecordWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; * @created 2021-06-11 11:30 **/ @Service -public class OfflineRecordServiceImpl extends BaseServiceImpl implements IOfflineRecordService { +public class OfflineRecordServiceImpl extends ServiceImpl implements IOfflineRecordService { @Autowired private OfflineRecordMapper mapper; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineTaskServiceImpl.java index 3f76a4a..c5f09f5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineTaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/OfflineTaskServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzinfo.inspect.offline.service.IOfflineRecordService; import com.hnac.hzinfo.inspect.offline.service.IOfflineTaskService; import com.hnac.hzinfo.inspect.offline.vo.OfflineRecordVO; import com.hnac.hzinfo.inspect.offline.wrapper.OfflineRecordWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -23,6 +23,6 @@ import org.springframework.stereotype.Service; * @Author: ysj */ @Service -public class OfflineTaskServiceImpl extends BaseServiceImpl implements IOfflineTaskService { +public class OfflineTaskServiceImpl extends ServiceImpl implements IOfflineTaskService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java index ed47022..c0a5351 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java @@ -127,7 +127,7 @@ public class PlanController extends BladeController { @ApiOperation(value = "逻辑删除,不删除关联信息", notes = "传入ids") @Operate(label = "删除巡检计划",type = BusinessType.DELETE, risk = Risk.MEDIUM,ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(planService.deleteLogic(Func.toLongList(ids))); + return R.status(planService.removeByIds(Func.toLongList(ids))); } /** @@ -163,7 +163,7 @@ public class PlanController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除计划中的对象模板", notes = "传入ids") public R removePlanObjectTemplate(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(planObjectTemplateService.deleteLogic(Func.toLongList(ids))); + return R.status(planObjectTemplateService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java index 20f8536..ab8c6f3 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java @@ -113,7 +113,7 @@ public class RouteController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "删除巡检路径",type = BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(st_re_routeService.deleteLogic(Func.toLongList(ids))); + return R.status(st_re_routeService.removeByIds(Func.toLongList(ids))); } @GetMapping("/getRouteByObjectId") diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanObjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanObjectTemplateService.java index 526001d..29f76ef 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanObjectTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanObjectTemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.plan.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; /** @@ -9,6 +10,6 @@ import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; * * @author Chill */ -public interface IPlanObjectTemplateService extends BaseService { +public interface IPlanObjectTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanOrgService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanOrgService.java index 2d4be83..2a8b6ca 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanOrgService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanOrgService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.plan.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; /** @@ -9,6 +10,6 @@ import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; * * @author Chill */ -public interface IPlanOrgService extends BaseService { +public interface IPlanOrgService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanPositionService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanPositionService.java index f83150b..190a662 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanPositionService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanPositionService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.plan.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; /** @@ -9,6 +10,6 @@ import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; * * @author Chill */ -public interface IPlanPositionService extends BaseService { +public interface IPlanPositionService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java index bf491d2..38d8e2c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.plan.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.vo.PlanOfflineVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; import com.hnac.hzinfo.inspect.plan.vo.PlanVO; @@ -12,7 +13,7 @@ import java.util.List; * * @author Chill */ -public interface IPlanService extends BaseService { +public interface IPlanService extends IService { /** * 保存巡检计划 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanUserService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanUserService.java index 4c90696..c3eaa9f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanUserService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IPlanUserService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.plan.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; /** @@ -9,6 +10,6 @@ import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; * * @author Chill */ -public interface IPlanUserService extends BaseService { +public interface IPlanUserService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IRouteService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IRouteService.java index c10afef..2e2241d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IRouteService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/IRouteService.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.plan.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.plan.entity.RouteEntity; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author py */ -public interface IRouteService extends BaseService { +public interface IRouteService extends IService { /** * 获取使用到相关对象ID的所有路径 * @param objectId 对象ID diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanObjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanObjectTemplateServiceImpl.java index 6586437..b78ce03 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanObjectTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanObjectTemplateServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.plan.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; @@ -13,6 +13,6 @@ import com.hnac.hzinfo.inspect.plan.service.IPlanObjectTemplateService; * @author Chill */ @Service -public class PlanObjectTemplateServiceImpl extends BaseServiceImpl implements IPlanObjectTemplateService { +public class PlanObjectTemplateServiceImpl extends ServiceImpl implements IPlanObjectTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanOrgServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanOrgServiceImpl.java index 7970b07..9c5479b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanOrgServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanOrgServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.plan.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; @@ -13,6 +13,6 @@ import com.hnac.hzinfo.inspect.plan.service.IPlanOrgService; * @author Chill */ @Service -public class PlanOrgServiceImpl extends BaseServiceImpl implements IPlanOrgService { +public class PlanOrgServiceImpl extends ServiceImpl implements IPlanOrgService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanPositionServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanPositionServiceImpl.java index 9757b33..c20db8e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanPositionServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanPositionServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.plan.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; @@ -13,6 +13,6 @@ import com.hnac.hzinfo.inspect.plan.service.IPlanPositionService; * @author Chill */ @Service -public class PlanPositionServiceImpl extends BaseServiceImpl implements IPlanPositionService { +public class PlanPositionServiceImpl extends ServiceImpl implements IPlanPositionService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java index b060ace..64de9a2 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java @@ -30,7 +30,7 @@ import com.hnac.hzinfo.inspect.task.job.service.impl.ConcurrentTaskServcie; import com.hnac.hzinfo.inspect.task.job.service.impl.SeizeTaskService; import com.hnac.hzinfo.inspect.task.service.ITaskService; 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.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; @@ -52,7 +52,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class PlanServiceImpl extends BaseServiceImpl implements IPlanService { +public class PlanServiceImpl extends ServiceImpl implements IPlanService { @Autowired private IPlanObjectTemplateService planObjectTemplateService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanUserServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanUserServiceImpl.java index a1c85c3..b3930c7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanUserServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanUserServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.plan.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; @@ -13,6 +13,6 @@ import com.hnac.hzinfo.inspect.plan.service.IPlanUserService; * @author Chill */ @Service -public class PlanUserServiceImpl extends BaseServiceImpl implements IPlanUserService { +public class PlanUserServiceImpl extends ServiceImpl implements IPlanUserService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/RouteServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/RouteServiceImpl.java index 5de0714..189c772 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/RouteServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/RouteServiceImpl.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.plan.entity.RouteEntity; import com.hnac.hzinfo.inspect.plan.mapper.RouteMapper; import com.hnac.hzinfo.inspect.plan.service.IRouteService; @@ -21,7 +21,7 @@ import java.util.stream.IntStream; * @author py */ @Service -public class RouteServiceImpl extends BaseServiceImpl implements IRouteService { +public class RouteServiceImpl extends ServiceImpl implements IRouteService { @Override public List getRouteByObjectId(Long objectId) { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java index 7afc4f0..dac2ba5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.report.controller; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.hnac.hzinfo.inspect.gather.vo.TaskGatherQueryVO; import com.hnac.hzinfo.inspect.report.entity.InspectMonthReportExcel; import com.hnac.hzinfo.inspect.report.entity.MonthRoutReport; @@ -90,7 +90,7 @@ public class InspectReportController { map.put("success", "false"); map.put("msg", "按月巡检详细信息导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } @@ -133,7 +133,7 @@ public class InspectReportController { map.put("success", "false"); map.put("msg", "集控站按月巡检详细信息导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java index d987eba..85bbc9b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.EventRecordTemplateEntity; -import org.springblade.core.mp.base.BaseService; -public interface IEventRecordTemplateService extends BaseService { + +public interface IEventRecordTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java index 3e4a685..3df2b10 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.EventTemplateEntity; -import org.springblade.core.mp.base.BaseService; -public interface IEventTemplateService extends BaseService { + +public interface IEventTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java index 2e94bdb..3cfbf8b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.showTemplate.entity.PlanTemplateEntity; -import org.springblade.core.mp.base.BaseService; + /** * @ClassName IPlanTemplateService @@ -10,6 +11,6 @@ import org.springblade.core.mp.base.BaseService; * @create: 2023-10-12 10:18 * @Version 4.0 **/ -public interface IPlanTemplateService extends BaseService { +public interface IPlanTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java index 75453fc..d2309d3 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectContentTemplateEntity; -import org.springblade.core.mp.base.BaseService; + /** * @ClassName ITaskObjectProjectContentTemplateService @@ -10,6 +11,6 @@ import org.springblade.core.mp.base.BaseService; * @create: 2023-10-12 14:53 * @Version 4.0 **/ -public interface ITaskObjectProjectContentTemplateService extends BaseService { +public interface ITaskObjectProjectContentTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java index b24b006..b607be1 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectTemplateEntity; -import org.springblade.core.mp.base.BaseService; -public interface ITaskObjectProjectTemplateService extends BaseService { + +public interface ITaskObjectProjectTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java index d291692..5a11646 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectTemplateEntity; -import org.springblade.core.mp.base.BaseService; -public interface ITaskObjectTemplateService extends BaseService { + +public interface ITaskObjectTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java index aa073ec..a523762 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.showTempalte.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskTemplateEntity; -import org.springblade.core.mp.base.BaseService; -public interface ITaskTemplateService extends BaseService { + +public interface ITaskTemplateService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java index f56f3b0..d01db6d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.showTempalte.service.impl; import com.hnac.hzinfo.inspect.showTempalte.mapper.EventRecordTemplateMapper; import com.hnac.hzinfo.inspect.showTempalte.service.IEventRecordTemplateService; import com.hnac.hzinfo.inspect.task.entity.EventRecordTemplateEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; * @Version 4.0 **/ @Service -public class EventRecordTemplateServiceImpl extends BaseServiceImpl implements IEventRecordTemplateService { +public class EventRecordTemplateServiceImpl extends ServiceImpl implements IEventRecordTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java index 83636fc..bffc5b7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.showTempalte.service.impl; import com.hnac.hzinfo.inspect.showTempalte.mapper.EventTemplateMapper; import com.hnac.hzinfo.inspect.showTempalte.service.IEventTemplateService; import com.hnac.hzinfo.inspect.task.entity.EventTemplateEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; * @Version 4.0 **/ @Service -public class EventTemplateServiceImpl extends BaseServiceImpl implements IEventTemplateService { +public class EventTemplateServiceImpl extends ServiceImpl implements IEventTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java index 01675f6..5c5082f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.showTempalte.service.impl; import com.hnac.hzinfo.inspect.showTempalte.mapper.PlanTemplateMapper; import com.hnac.hzinfo.inspect.showTempalte.service.IPlanTemplateService; import com.hnac.hzinfo.inspect.showTemplate.entity.PlanTemplateEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * @Version 4.0 **/ @Service -public class PlanTemplateServiceImpl extends BaseServiceImpl implements IPlanTemplateService { +public class PlanTemplateServiceImpl extends ServiceImpl implements IPlanTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java index 5a8aef2..5821f15 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.showTempalte.service.impl; import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskObjectProjectContentTemplateMapper; import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectProjectContentTemplateService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectContentTemplateEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; * @Version 4.0 **/ @Service -public class TaskObjectProjectContentTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectProjectContentTemplateService { +public class TaskObjectProjectContentTemplateServiceImpl extends ServiceImpl implements ITaskObjectProjectContentTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java index a05d730..93b59da 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java @@ -5,12 +5,12 @@ import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectProjectTemplateSe import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectTemplateEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j -public class TaskObjectProjectTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectProjectTemplateService { +public class TaskObjectProjectTemplateServiceImpl extends ServiceImpl implements ITaskObjectProjectTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java index 2d29e91..b0ed1f6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.showTempalte.service.impl; import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskObjectTemplateMapper; import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectTemplateService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectTemplateEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; * @Version 4.0 **/ @Service -public class TaskObjectTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectTemplateService { +public class TaskObjectTemplateServiceImpl extends ServiceImpl implements ITaskObjectTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java index 6ec3039..442a824 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java @@ -6,12 +6,12 @@ import com.hnac.hzinfo.inspect.showTempalte.service.ITaskTemplateService; import com.hnac.hzinfo.inspect.showTemplate.entity.TaskTemplateEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j -public class TaskTemplateServiceImpl extends BaseServiceImpl implements ITaskTemplateService { +public class TaskTemplateServiceImpl extends ServiceImpl implements ITaskTemplateService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index b436ffd..f738356 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -1,8 +1,8 @@ package com.hnac.hzinfo.inspect.task.controller; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -47,6 +47,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.resource.feign.IPushClient; import org.springblade.resource.vo.PushInfoVO; +import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springframework.beans.factory.annotation.Autowired; @@ -79,6 +80,8 @@ public class TaskController extends BladeController { private final ITaskUserService taskUserService; private final IEventService eventService; private final IRobotTaskVideoService robotTaskVideoService; + private final ISysClient iSysClient; + /** * 根据计划id获取任务列表 @@ -196,7 +199,7 @@ public class TaskController extends BladeController { map.put("isSuccess", "false"); map.put("msg", "巡检任务报表" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } @@ -362,12 +365,15 @@ public class TaskController extends BladeController { * 逻辑删除任务 * 只有管理员能有该删除权限 */ - @PreAuth("hasAnyRole('admin','administrator')") +// @PreAuth("hasAnyRole('admin','administrator')") @PostMapping("/removeTask") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除任务，只有管理员能有该删除权限", notes = "传入ids") public R removePlanObjectTemplate(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(taskService.deleteLogic(Func.toLongList(ids))); + if (AuthUtil.isAdministrator()||AuthUtil.isAdmin()) { + return R.status(taskService.removeByIds(Func.toLongList(ids))); + } + return R.fail("只有管理员能有该删除权限,请检查账号重试！"); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventAttachmentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventAttachmentService.java index 6948085..eea42bc 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventAttachmentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventAttachmentService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.EventAttachmentEntity; @@ -10,7 +11,7 @@ import com.hnac.hzinfo.inspect.task.entity.EventAttachmentEntity; * * @author Chill */ -public interface IEventAttachmentService extends BaseService { +public interface IEventAttachmentService extends IService { /** * 删除 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventRecordService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventRecordService.java index 1847923..e3584f6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventRecordService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventRecordService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.EventRecordEntity; /** @@ -9,7 +10,7 @@ import com.hnac.hzinfo.inspect.task.entity.EventRecordEntity; * * @author Chill */ -public interface IEventRecordService extends BaseService { +public interface IEventRecordService extends IService { /** * 删除 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventService.java index ff6f82b..b28910f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/IEventService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.EventEntity; import com.hnac.hzinfo.inspect.task.vo.EventAddVO; @@ -12,7 +13,7 @@ import java.util.List; * * @author Chill */ -public interface IEventService extends BaseService { +public interface IEventService extends IService { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java index 12008f7..a7bb3f4 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface ITaskObjectProjectContentService extends BaseService { +public interface ITaskObjectProjectContentService extends IService { List getTaskObjectProjectContentList(TaskObjectProjectContentEntity topc); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java index 64628ae..7dbf8e9 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java @@ -1,7 +1,8 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface ITaskObjectProjectService extends BaseService { +public interface ITaskObjectProjectService extends IService { List getTaskObjectProjectList(TaskObjectProjectEntity top); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java index e99baeb..99dadd9 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java @@ -1,9 +1,10 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * * @author Chill */ -public interface ITaskObjectService extends BaseService { +public interface ITaskObjectService extends IService { List getTaskObjectList(TaskObjectEntity taskObjectEntity); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskRecordService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskRecordService.java index 87adeaa..1bce021 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskRecordService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskRecordService.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.task.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.TaskRecordEntity; /** @@ -8,7 +9,7 @@ import com.hnac.hzinfo.inspect.task.entity.TaskRecordEntity; * * @author Chill */ -public interface ITaskRecordService extends BaseService { +public interface ITaskRecordService extends IService { /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskResultService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskResultService.java index e5b2844..ae9c50c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskResultService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskResultService.java @@ -1,13 +1,14 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface ITaskResultService extends BaseService { +public interface ITaskResultService extends IService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java index df61c52..d8e1755 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java @@ -2,13 +2,14 @@ package com.hnac.hzinfo.inspect.task.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; import com.hnac.hzinfo.inspect.task.dto.TaskDTO; import com.hnac.hzinfo.inspect.task.entity.InspectionTaskSMS; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.vo.*; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.BladePage; import org.springblade.core.tool.api.R; @@ -20,7 +21,7 @@ import java.util.Map; * * @author Chill */ -public interface ITaskService extends BaseService { +public interface ITaskService extends IService { /** * 删除任务，任务的所有关联表 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskUserService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskUserService.java index 1ee7d87..a81eb99 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskUserService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskUserService.java @@ -1,8 +1,9 @@ package com.hnac.hzinfo.inspect.task.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface ITaskUserService extends BaseService { +public interface ITaskUserService extends IService { /** * 删除 * @param planId 计划id diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventAttachmentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventAttachmentServiceImpl.java index 70adb3b..0d9d420 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventAttachmentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventAttachmentServiceImpl.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.task.service.impl; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import com.hnac.hzinfo.inspect.task.entity.EventAttachmentEntity; @@ -14,7 +14,7 @@ import com.hnac.hzinfo.inspect.task.service.IEventAttachmentService; * @author Chill */ @Service -public class EventAttachmentServiceImpl extends BaseServiceImpl implements IEventAttachmentService { +public class EventAttachmentServiceImpl extends ServiceImpl implements IEventAttachmentService { /** * 删除 * @param planId 计划id diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventRecordServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventRecordServiceImpl.java index dc9bac4..56e6931 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventRecordServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventRecordServiceImpl.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.task.service.impl; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.task.entity.EventRecordEntity; import com.hnac.hzinfo.inspect.task.mapper.EventRecordMapper; import com.hnac.hzinfo.inspect.task.service.IEventRecordService; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class EventRecordServiceImpl extends BaseServiceImpl implements IEventRecordService { +public class EventRecordServiceImpl extends ServiceImpl implements IEventRecordService { /** * 删除 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java index f5f8b84..cc821d4 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java @@ -18,8 +18,8 @@ import com.hnac.hzinfo.inspect.task.vo.EventAddVO; import com.hnac.hzinfo.inspect.task.vo.EventRecordAddVO; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.mp.base.BaseServiceImpl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -46,7 +46,7 @@ import java.util.List; */ @Service @Slf4j -public class EventServiceImpl extends BaseServiceImpl implements IEventService { +public class EventServiceImpl extends ServiceImpl implements IEventService { @Autowired private IEventRecordService eventRecordService; @@ -68,9 +68,6 @@ public class EventServiceImpl extends BaseServiceImpl getEventList(EventEntity event){ return this.baseMapper.getEvents(event); @@ -299,7 +296,7 @@ public class EventServiceImpl extends BaseServiceImpl url).orElse(url)); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java index 0beb398..e8b2c49 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import com.hnac.hzinfo.sdk.v5.redis.RedisClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectContentMapper; import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService; @@ -39,7 +39,7 @@ import java.util.Optional; @Service @AllArgsConstructor @Slf4j -public class TaskObjectProjectContentServiceImpl extends BaseServiceImpl implements ITaskObjectProjectContentService { +public class TaskObjectProjectContentServiceImpl extends ServiceImpl implements ITaskObjectProjectContentService { private final ContentService contentService; private final IAnalyseDataSearchClient analyseDataSearchClient; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java index b115b5c..386ebce 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.task.service.impl; import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper; import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectService; @@ -15,7 +15,7 @@ import java.util.List; * @author Chill */ @Service -public class TaskObjectProjectServiceImpl extends BaseServiceImpl implements ITaskObjectProjectService { +public class TaskObjectProjectServiceImpl extends ServiceImpl implements ITaskObjectProjectService { @Override public List getTaskObjectProjectList(TaskObjectProjectEntity top){ return this.baseMapper.getTaskObjectProjects(top); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java index 0b55999..412d65c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java @@ -20,7 +20,7 @@ import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.utils.HiKUtil; import lombok.AllArgsConstructor; -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.Func; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class TaskObjectServiceImpl extends BaseServiceImpl implements ITaskObjectService { +public class TaskObjectServiceImpl extends ServiceImpl implements ITaskObjectService { private final ITaskObjectProjectContentService taskContentService; private final ProjectService projectService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java index fc735c9..fe03308 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzinfo.inspect.task.service.ITaskRecordService; import com.hnac.hzinfo.inspect.task.service.ITaskService; import com.hnac.hzinfo.inspect.task.service.ITaskUserService; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.time.LocalDateTime; * @author Chill */ @Service -public class TaskRecordServiceImpl extends BaseServiceImpl implements ITaskRecordService { +public class TaskRecordServiceImpl extends ServiceImpl implements ITaskRecordService { @Autowired private ITaskUserService taskUserService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskResultServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskResultServiceImpl.java index 0cdb0b3..fbd3e21 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskResultServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskResultServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.task.service.impl; import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskResultMapper; import com.hnac.hzinfo.inspect.task.service.ITaskResultService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class TaskResultServiceImpl extends BaseServiceImpl implements ITaskResultService { +public class TaskResultServiceImpl extends ServiceImpl implements ITaskResultService { } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index 290ea22..6877dc8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -38,7 +38,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; 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.BladePage; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -74,7 +74,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class TaskServiceImpl extends BaseServiceImpl implements ITaskService { +public class TaskServiceImpl extends ServiceImpl implements ITaskService { @Autowired private ITaskObjectService taskObjectService; @@ -267,8 +267,8 @@ public class TaskServiceImpl extends BaseServiceImpl imp public void checkOpenMutipleTask(Long userId) { R r = sysClient.getParamValue(TaskContants.OPEN_MULTIPLE_TASK); if (r.isSuccess() && "0".equals(r.getData())) {//处理同时开启几个任务的情况 - int count = taskUserService.count(Wrappers.query().lambda().eq(TaskUserEntity::getUserId, userId).eq(TaskUserEntity::getClaimStatus, ClaimStatusEnum.COLLECT.getStatus())); - if (count > 0) { + Long count = taskUserService.count(Wrappers.query().lambda().eq(TaskUserEntity::getUserId, userId).eq(TaskUserEntity::getClaimStatus, ClaimStatusEnum.COLLECT.getStatus())); + if (count > 0l) { log.error("不能同时开启两个巡检任务"); throw new ServiceException("不能同时开启两个巡检任务"); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskUserServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskUserServiceImpl.java index 1ac38d0..1f1764b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskUserServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskUserServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskUserMapper; import com.hnac.hzinfo.inspect.task.service.ITaskUserService; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; * @author Chill */ @Service -public class TaskUserServiceImpl extends BaseServiceImpl implements ITaskUserService { +public class TaskUserServiceImpl extends ServiceImpl implements ITaskUserService { /** * 删除 * @param planId 计划id diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java index dde7a0b..3d57ca5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.utils; -import com.alibaba.druid.support.json.JSONUtils; + +import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode; @@ -9,8 +10,6 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; -import org.springblade.core.http.HttpRequest; -import org.springblade.core.http.LogLevel; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.Func; @@ -151,7 +150,7 @@ public class HiKUtil { }; //STEP4：设置参数提交方式 String contentType = "application/json"; - String body = JSONUtils.toJSONString(map); + String body = JSON.toJSONString(map); //post请求application/json类型参数 String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null); JSONObject object = JsonUtil.parse(result, JSONObject.class); @@ -164,37 +163,37 @@ public class HiKUtil { * @return 图片存储在minio的地址 */ private static String getVedioPicUrl(String picUrl) { - byte[] file = HttpRequest.get(picUrl) +// byte[] file = HttpRequest.get(picUrl) // 设定全局日志级别 NONE，BASIC，HEADERS，BODY， 默认：NONE - .log(LogLevel.BODY) - .execute() - .onFailed(((request, e) -> { - System.out.println("获取图片信息失败：" + e.toString()); - })) - .asBytes(); +// .log(LogLevel.BODY) +// .execute() +// .onFailed(((request, e) -> { +// System.out.println("获取图片信息失败：" + e.toString()); +// })) +// .asBytes(); //上传到minio - RequestBody body = RequestBody.create(MediaType.parse("application/octet-stream") - , file); - MultipartBody multipartBody = new MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("file", "jietu.jpg", body) - .build(); - JsonNode result = HttpRequest.post(minioUrl + "/api/blade-resource/oss/endpoint/put-file?code=minio") - // 设定全局日志级别 NONE，BASIC，HEADERS，BODY， 默认：NONE - .log(LogLevel.BASIC) - .body(multipartBody) - .execute() - .onFailed(((request, e) -> { - System.out.println("上传视频截图到minio失败：" + e.toString()); - })) - .asJsonNode(); +// RequestBody body = RequestBody.create(MediaType.parse("application/octet-stream") +// , file); +// MultipartBody multipartBody = new MultipartBody.Builder() +// .setType(MultipartBody.FORM) +// .addFormDataPart("file", "jietu.jpg", body) +// .build(); +// JsonNode result = HttpRequest.post(minioUrl + "/api/blade-resource/oss/endpoint/put-file?code=minio") +// // 设定全局日志级别 NONE，BASIC，HEADERS，BODY， 默认：NONE +// .log(LogLevel.BASIC) +// .body(multipartBody) +// .execute() +// .onFailed(((request, e) -> { +// System.out.println("上传视频截图到minio失败：" + e.toString()); +// })) +// .asJsonNode(); String re = ""; - if(Func.isNotEmpty(result) && Func.isNotEmpty(result.get("data"))){ - JsonNode data = result.get("data"); - re = data.get("link").asText(); - } +// if(Func.isNotEmpty(result) && Func.isNotEmpty(result.get("data"))){ +// JsonNode data = result.get("data"); +// re = data.get("link").asText(); +// } return re; } diff --git a/hzims-service/inspect/src/main/resources/template/template.yml b/hzims-service/inspect/src/main/resources/template/template.yml new file mode 100644 index 0000000..91cea22 --- /dev/null +++ b/hzims-service/inspect/src/main/resources/template/template.yml @@ -0,0 +1,151 @@ +#服务器端口 +server: + port: 8200 + +#oss配置 +oss: + enabled: true + name: minio + tenant-mode: false + bucket-name: prd200000 + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +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_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.inspect, - org.springbalde + +xxl: + job: + accessToken: '' + admin: + addresses: "http://${hzims.server.ip}:7009/xxl-job-admin" + executor: + appname: hzinfo-inspect + ip: "${hzims.server.ip}" + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 7 + port: 28132 + + +hzinfo: + redis: + key: + taskEndRemind: hzims:inspect:task:end:remind + task: + pdf: + # pdf模板路径 ，请配置绝对路径 + module-path: /data/inspect/pdf/templet/inspectObj.html + # module-path: D:\data\hzinfo\templet\inspectObj.html # windows + # pdf文件存储路径，请配置绝对路径 + file-path: /data/inspect/pdf/file + # file-path: D:/data/hzinfo/file # windows + + +hzims: + tasks: + flag: 1 + inspect: + ai: + # 文件外网访问路径 + replace-url: http://175.6.40.67:19000 + rabbit-mq-send-topic: inspect_task_send_ia_task + face: + # 人脸识别服务地址 + url: http://192.168.65.249:9876 + # 越小精度越高 + ratio: 0.6 + video: + # 文件内网访问路径 + minio-url: http://192.168.1.26:9000 + task: + #短信模块code + templateCode: + #巡检任务开始前发送短信信息阿里云模板 + taskBegin: aliyun-task-begin + taskBeginV2: inspect-task-remind + #巡检任务结束前发送短信信息阿里云模板 + taskEnd: aliyun-task-end + #巡检消息推送模板 - 极光 + jgPushCode: hzinfo-inspect + offline: + download: + path: /data/inspect/offline/download + table: HZ_ST_EX_TASK_USER,HZ_ST_EX_TASK,HZ_ST_RE_PLAN,HZ_ST_EX_EVENT,HZ_ST_EVENT_ATTACHMENT,HZ_ST_EX_EVENT_RECORD,HZ_ST_EX_OBJECT,HZ_ST_EX_OBJECT_PROJECT,HZ_ST_EX_OBJECT_PROJECT_CONTENT,HZ_ST_RE_OBJECT,HZ_ST_RE_PROJECT,HZ_ST_RE_CONTENT,HZ_ST_RE_OBJECT_DANGER,HZ_OFFLINE_TASK + upload: + path: /data/inspect/offline/upload + +offline: + temp: + download: /data/hzims/temp/offline/download + sync: /data/hzims/temp/offline/sync + max-size: 1073741824 + +#sms: +# aliyun: +# connectTimeout: 10000 +# readTimeout: 10000 +# proxyDomain: 175.6.40.67:37880 +# accessKeyId: 7262257e6dd16e85ddfee09d3e8eedaa +# accessKeySecret: 7dba15f64eba724521d0ecd4c02a8a3e49f3ffa95ff75d63a3c4a88a1679282b173e5c13ddbba3eb2699a65a1be1b32b +# profilePoint: cn-changsha +# endPoint: cn-changsha +# signName: 华自科技 + +logging: + level: + # org.springblade.resource.feign.OssClient: DEBUG + com.hnac.hzinfo.inspect: DEBUG +feign: + client: + config: + # feign全局日志级别 + default: + loggerLevel: FULL + + + +blade: + data-scope: + enabled: false + mqtt: + enabled: true + userName: emqx + password: hzims@emqx + urls: tcp://192.168.60.29:1883 + clientId: hzinfo_inspect + topicNames: topic_ai_events + data: + sdk: + enabled: true + url: http://192.168.60.29/api/hzinfo-data-config + ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler + appId: '1706919441406693378' + appSecret: 4bf4fa0d713921ed4e1b22bfac4993ac + redisIp: 192.168.60.29 + redisPort: 3577 + password: L_MM&h=+Nm&p)U9sk.uH + maxKeys: 1000 diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 1419f90..8840e26 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -45,7 +45,7 @@ com.baomidou dynamic-datasource-spring-boot-starter - 2.5.6 + 3.5.0 com.xuxueli @@ -81,6 +81,14 @@ hzims-${project.name}-${project.version} + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-source-plugin + + com.spotify dockerfile-maven-plugin diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/MessageApplication.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/MessageApplication.java index 6deb8e2..530de85 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/MessageApplication.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/MessageApplication.java @@ -1,14 +1,16 @@ package com.hnac.hzims.message; import org.mybatis.spring.annotation.MapperScan; -import org.springblade.core.cloud.feign.EnableBladeFeign; + import org.springblade.core.launch.BladeApplication; -import org.springframework.cloud.client.SpringCloudApplication; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -@EnableBladeFeign -@SpringCloudApplication -@MapperScan("com.hnac.hzims.*.**.mapper.**") +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo", "com.hnac.hzims"}) +@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper", "com.hnac.hzims.**.mapper"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @ComponentScan(basePackages = {"com.hnac.*"}) public class MessageApplication { diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/controller/SmsConfigController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/controller/SmsConfigController.java index 0465da8..8f0b91b 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/controller/SmsConfigController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/controller/SmsConfigController.java @@ -16,8 +16,6 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springblade.resource.entity.Sms; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/IMessageConfigService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/IMessageConfigService.java index 604e8da..e0f628e 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/IMessageConfigService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/IMessageConfigService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.message.configure.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.entity.config.ConfigEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; /** * @author hx */ -public interface IMessageConfigService extends BaseService { +public interface IMessageConfigService extends IService { /** * 推送消息 diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/MailConfigServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/MailConfigServiceImpl.java index f851242..ac1387f 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/MailConfigServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/MailConfigServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.message.service.IMessageService; import com.hnac.hzims.message.utils.HtmlModule; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; */ @Service("mailConfigService") @Slf4j -public class MailConfigServiceImpl extends BaseServiceImpl implements IMailConfigService { +public class MailConfigServiceImpl extends ServiceImpl implements IMailConfigService { @Autowired @Qualifier("mailPushService") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/PushConfigServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/PushConfigServiceImpl.java index e953dbe..9084cc8 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/PushConfigServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/PushConfigServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.message.service.IMessageService; import com.hnac.hzims.message.configure.service.IPushConfigService; import com.hnac.hzinfo.core.push.enums.PlatformType; import com.hnac.hzinfo.core.push.enums.PushAudienceType; -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.utils.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * @author hx */ @Service("pushConfigService") -public class PushConfigServiceImpl extends BaseServiceImpl implements IPushConfigService { +public class PushConfigServiceImpl extends ServiceImpl implements IPushConfigService { @Autowired @Qualifier("appPushService") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/SmsConfigServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/SmsConfigServiceImpl.java index e2a43a0..4360b09 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/SmsConfigServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/SmsConfigServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.message.push.service.IPushService; import com.hnac.hzims.message.configure.service.ISmsConfigService; import com.hnac.hzims.message.service.IPushMessageService; 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.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; */ @Service("smsConfigService") @Slf4j -public class SmsConfigServiceImpl extends BaseServiceImpl implements ISmsConfigService { +public class SmsConfigServiceImpl extends ServiceImpl implements ISmsConfigService { @Autowired @Qualifier("smsPushService") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/WsConfigServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/WsConfigServiceImpl.java index d4ca658..c5c0dac 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/WsConfigServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/configure/service/impl/WsConfigServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.message.configure.mapper.WsConfigMapper; import com.hnac.hzims.message.push.service.IPushService; import com.hnac.hzims.message.service.IMessageService; import com.hnac.hzims.message.configure.service.IWsConfigService; -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.utils.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * @author hx */ @Service("wsConfigService") -public class WsConfigServiceImpl extends BaseServiceImpl implements IWsConfigService { +public class WsConfigServiceImpl extends ServiceImpl implements IWsConfigService { @Autowired @Qualifier("wsPushService") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageController.java index 8067449..f767c70 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageController.java @@ -5,9 +5,7 @@ import com.hnac.hzims.message.dto.AppPushDto; import com.hnac.hzims.message.dto.MailPushDto; import com.hnac.hzims.message.dto.SmsPushDto; import com.hnac.hzims.message.dto.WsPushDto; -import com.hnac.hzims.message.fegin.IPushMsgClient; import com.hnac.hzims.message.service.IMessageService; -import com.hnac.hzims.message.service.IPushMessageService; import com.hnac.hzims.message.service.impl.MailMessageServiceImpl; import com.hnac.hzims.message.service.impl.PushMessageServiceImpl; import com.hnac.hzims.message.service.impl.SmsMessageServiceImpl; @@ -15,12 +13,10 @@ import com.hnac.hzims.message.service.impl.WebsocketServiceImpl; import com.hnac.hzims.message.utils.HtmlModule; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; import org.springframework.web.bind.annotation.*; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageTemplateController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageTemplateController.java index 1099472..6fbf291 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageTemplateController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessageTemplateController.java @@ -1,6 +1,6 @@ package com.hnac.hzims.message.controller; -import com.aliyun.oss.ServiceException; + import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.common.logs.annotation.OperationAnnotation; @@ -8,11 +8,11 @@ import com.hnac.hzims.common.logs.enums.BusinessType; import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.message.entity.config.MessageTemplateEntity; import com.hnac.hzims.message.service.IMessageTemplateService; -import groovy.util.logging.Slf4j; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -58,7 +58,7 @@ public class MessageTemplateController extends BladeController { @ApiOperation("删除消息模板") @ApiOperationSupport(order = 4) public R delete(@PathVariable String ids) { - return R.status(messageTemplateService.deleteLogic(Func.toLongList(",",ids))); + return R.status(messageTemplateService.removeByIds(Func.toLongList(",",ids))); } @PutMapping("/update") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/aspect/LogAspect.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/aspect/LogAspect.java index aecc0e8..5771137 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/aspect/LogAspect.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/aspect/LogAspect.java @@ -26,7 +26,7 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -59,8 +59,6 @@ public class LogAspect { @Autowired private ExecutorService logExecutorService; - @Autowired - private BladeLogger bladeLogger; @Pointcut("@annotation(com.hnac.hzims.message.log.aspect.SaveLog)") public void logPointCut() { @@ -87,7 +85,7 @@ public class LogAspect { //执行方法 result = joinPoint.proceed(); } catch (Throwable throwable) { - bladeLogger.error("message-log",throwable.getMessage()); + log.error("message-log",throwable.getMessage()); throwable.printStackTrace(); errorLog = throwable.getMessage(); } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IAppLogService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IAppLogService.java index 0cc83e8..0382821 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IAppLogService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IAppLogService.java @@ -5,7 +5,7 @@ import com.hnac.hzims.message.dto.statistic.MsgPushStatisticDto; import com.hnac.hzims.message.entity.log.AppLogEntity; import com.hnac.hzinfo.core.push.enums.PlatformType; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -21,7 +21,7 @@ import java.util.stream.Collectors; */ public interface IAppLogService extends IMessageLogService { - BladeLogger bladeLogger = new BladeLogger(); + /** * 将app推送对象 转换为日志对象 @@ -41,7 +41,7 @@ public interface IAppLogService extends IMessageLogService { - bladeLogger.error("message-pushConvertLog","app推送 推送人不能为空"); +// log.error("message-pushConvertLog","app推送 推送人不能为空"); throw new ServiceException("app推送 推送人不能为空"); }); appLogEntity.setPusher(pushDto.getTags().stream().collect(Collectors.joining(","))); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IMessageLogService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IMessageLogService.java index 20f23f1..a03dabd 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IMessageLogService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/IMessageLogService.java @@ -1,18 +1,19 @@ package com.hnac.hzims.message.log.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.MailPushDto; import com.hnac.hzims.message.dto.PushDto; import com.hnac.hzims.message.dto.statistic.MsgPushStatisticDto; import com.hnac.hzims.message.entity.log.MailLogEntity; import com.hnac.hzims.message.entity.log.MessageLogEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IMessageLogService extends BaseService { +public interface IMessageLogService extends IService { /** * 推送对象转换为日志 * @param pushDto diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/AppLogServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/AppLogServiceImpl.java index 83a13e9..a076453 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/AppLogServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/AppLogServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.message.dto.statistic.MsgPushStatisticDto; import com.hnac.hzims.message.entity.log.AppLogEntity; import com.hnac.hzims.message.log.mapper.AppLogMapper; import com.hnac.hzims.message.log.service.IAppLogService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; @@ -16,6 +16,6 @@ import java.util.List; * @author hx */ @Service("appLogService") -public class AppLogServiceImpl extends BaseServiceImpl implements IAppLogService { +public class AppLogServiceImpl extends ServiceImpl implements IAppLogService { } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/MailLogServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/MailLogServiceImpl.java index 698aa5b..cee7c99 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/MailLogServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/MailLogServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.message.log.mapper.MailLogMapper; import com.hnac.hzims.message.log.service.IMailLogService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; @Service("mailLogService") @Slf4j @AllArgsConstructor -public class MailLogServiceImpl extends BaseServiceImpl +public class MailLogServiceImpl extends ServiceImpl implements IMailLogService { } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/SmsLogServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/SmsLogServiceImpl.java index 176396e..60bdce7 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/SmsLogServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/log/service/impl/SmsLogServiceImpl.java @@ -4,13 +4,13 @@ import com.hnac.hzims.message.entity.config.SmsConfigEntity; import com.hnac.hzims.message.entity.log.SmsLogEntity; import com.hnac.hzims.message.log.mapper.SmsLogMapper; import com.hnac.hzims.message.log.service.ISmsLogService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * @author hx */ @Service("smsLogService") -public class SmsLogServiceImpl extends BaseServiceImpl implements ISmsLogService { +public class SmsLogServiceImpl extends ServiceImpl implements ISmsLogService { } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/push/service/impl/MailPushServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/push/service/impl/MailPushServiceImpl.java index 4794ccc..61235f2 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/push/service/impl/MailPushServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/push/service/impl/MailPushServiceImpl.java @@ -5,13 +5,14 @@ import com.hnac.hzims.message.dto.MailPushDto; import com.hnac.hzims.message.log.aspect.SaveLog; import com.hnac.hzims.message.push.service.IPushService; import com.hnac.hzims.message.utils.HtmlModule; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; @@ -30,6 +31,7 @@ import java.util.Map; @RequiredArgsConstructor public class MailPushServiceImpl implements IPushService { + @Autowired private final JavaMailSender mailSender; @Value("${spring.mail.username}") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java index a19b2b6..e4d5172 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.BusinessMessageDTO; import com.hnac.hzims.message.dto.WxMessageDTO; import com.hnac.hzims.message.entity.MessagePushRecordEntity; import com.hnac.hzims.message.vo.UnreadMessageVO; import com.hnac.hzims.message.vo.msgpushrecord.*; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.RequestBody; @@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; -public interface IMessagePushRecordService extends BaseService { +public interface IMessagePushRecordService extends IService { /** * 查询消息推送记录列表 diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessageTemplateService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessageTemplateService.java index 14fb453..ce142bc 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessageTemplateService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessageTemplateService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.entity.config.MessageTemplateEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; -public interface IMessageTemplateService extends BaseService { +public interface IMessageTemplateService extends IService { /** * 查询消息模板列表 diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgMailRecordService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgMailRecordService.java index e2d13aa..deb7437 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgMailRecordService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgMailRecordService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.message.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.entity.MsgMailRecordEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface IMsgMailRecordService extends BaseService { +public interface IMsgMailRecordService extends IService { } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgPushRecordService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgPushRecordService.java index dab9157..3611f8f 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgPushRecordService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgPushRecordService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.MsgPushRecordDTO; import com.hnac.hzims.message.entity.MsgPushRecordEntity; import com.hnac.hzims.message.vo.MsgPushRecordVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-06-28 08:38 **/ -public interface IMsgPushRecordService extends BaseService { +public interface IMsgPushRecordService extends IService { R doSave(MsgPushRecordDTO req); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgSmsRecordService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgSmsRecordService.java index 118fc4f..00335b4 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgSmsRecordService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgSmsRecordService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.MsgSmsRecordDTO; import com.hnac.hzims.message.entity.MsgSmsRecordEntity; import com.hnac.hzims.message.vo.MsgSmsRecordVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-06-28 08:38 **/ -public interface IMsgSmsRecordService extends BaseService { +public interface IMsgSmsRecordService extends IService { R doSave(MsgSmsRecordDTO req); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordHistoryService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordHistoryService.java index 14d15c4..1ce6fd9 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordHistoryService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordHistoryService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.MsgWsRecordHistoryDTO; import com.hnac.hzims.message.entity.MsgWsRecordHistoryEntity; import com.hnac.hzims.message.vo.MsgWsRecordHistoryVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-06-28 16:45 **/ -public interface IMsgWsRecordHistoryService extends BaseService { +public interface IMsgWsRecordHistoryService extends IService { R doSave(MsgWsRecordHistoryDTO req); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordService.java index e4f5ec1..f475409 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMsgWsRecordService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.message.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.MsgUpdateStatusDTO; import com.hnac.hzims.message.dto.MsgWsRecordDTO; import com.hnac.hzims.message.entity.MsgWsRecordEntity; import com.hnac.hzims.message.vo.MsgWsRecordVO; import com.hnac.hzims.message.vo.UnreadMsgCountVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -18,7 +19,7 @@ import java.util.List; * @author xiashandong * @created 2021-06-28 08:38 **/ -public interface IMsgWsRecordService extends BaseService { +public interface IMsgWsRecordService extends IService { R doSave(MsgWsRecordDTO req); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IPushMessageService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IPushMessageService.java index b8a87b1..986a84d 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IPushMessageService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/IPushMessageService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.message.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.message.dto.PushMessageDTO; import com.hnac.hzims.message.entity.PushMessageEntity; import com.hnac.hzims.message.entity.config.SmsConfigEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IPushMessageService extends BaseService { +public interface IPushMessageService extends IService { /** * 获取短信推送列表 diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/PushService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/PushService.java index 57573aa..1023edb 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/PushService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/PushService.java @@ -17,7 +17,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.resource.feign.IPushClient; import org.springblade.resource.vo.PushInfoVO; -import org.springblade.resource.vo.PushVO; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestParam; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/SmsService.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/SmsService.java index 98e8de5..5cb336d 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/SmsService.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/SmsService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.message.service; import com.alibaba.fastjson.JSONObject; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.message.dto.MsgSmsRecordDTO; import com.hnac.hzims.message.req.SmsReq; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.springblade.core.sms.model.SmsResponse; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java index 2dab3a3..66e42b9 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java @@ -28,13 +28,10 @@ import com.hnac.hzims.message.service.IMessageService; import com.hnac.hzims.message.vo.UnreadMessageVO; import com.hnac.hzims.message.vo.msgpushrecord.*; import com.hnac.hzinfo.core.push.model.PushResponse; -import com.xxl.job.core.log.XxlJobLogger; -import io.minio.messages.Item; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.common.utils.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -64,7 +61,7 @@ import java.util.stream.IntStream; @Service @RequiredArgsConstructor @Slf4j -public class MessagePushRecordServiceImpl extends BaseServiceImpl implements IMessagePushRecordService { +public class MessagePushRecordServiceImpl extends ServiceImpl implements IMessagePushRecordService { private final MprNoAurhScopeMapper noAurhScopeMapper; private final IMessageService smsMessageService; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessageTemplateServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessageTemplateServiceImpl.java index 2012749..2a9a5f8 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessageTemplateServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessageTemplateServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.message.service.IMessageTemplateService; import com.hnac.hzims.message.wrapper.MessageTemplateWrapper; import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; @@ -20,7 +20,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class MessageTemplateServiceImpl extends BaseServiceImpl implements IMessageTemplateService { +public class MessageTemplateServiceImpl extends ServiceImpl implements IMessageTemplateService { @Override public List list(MessageTemplateEntity req) { List record = this.list(this.getQueryWrapper(req)); diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgMailRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgMailRecordServiceImpl.java index 48e3214..7d142f1 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgMailRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgMailRecordServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.message.entity.MsgMailRecordEntity; import com.hnac.hzims.message.mapper.MsgMailRecordMapper; import com.hnac.hzims.message.service.IMsgMailRecordService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class MsgMailRecordServiceImpl extends BaseServiceImpl implements IMsgMailRecordService { +public class MsgMailRecordServiceImpl extends ServiceImpl implements IMsgMailRecordService { } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgPushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgPushRecordServiceImpl.java index 319912d..a6f4820 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgPushRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgPushRecordServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.message.service.IPushMessageService; import com.hnac.hzims.message.vo.MsgPushRecordVO; import com.hnac.hzims.message.wrapper.MsgPushRecordWrapper; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.api.R; @@ -25,7 +25,7 @@ import org.springframework.stereotype.Service; * @created 2021-06-28 08:38 **/ @Service -public class MsgPushRecordServiceImpl extends BaseServiceImpl implements IMsgPushRecordService { +public class MsgPushRecordServiceImpl extends ServiceImpl implements IMsgPushRecordService { @Autowired private MsgPushRecordMapper mapper; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgSmsRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgSmsRecordServiceImpl.java index 73be795..8ca3679 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgSmsRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgSmsRecordServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.message.mapper.MsgSmsRecordMapper; import com.hnac.hzims.message.service.IMsgSmsRecordService; import com.hnac.hzims.message.vo.MsgSmsRecordVO; import com.hnac.hzims.message.wrapper.MsgSmsRecordWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; * @created 2021-06-28 08:38 **/ @Service -public class MsgSmsRecordServiceImpl extends BaseServiceImpl implements IMsgSmsRecordService { +public class MsgSmsRecordServiceImpl extends ServiceImpl implements IMsgSmsRecordService { @Autowired private MsgSmsRecordMapper mapper; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordHistoryServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordHistoryServiceImpl.java index 42f9353..9d31b04 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordHistoryServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordHistoryServiceImpl.java @@ -3,14 +3,15 @@ package com.hnac.hzims.message.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.message.dto.MsgWsRecordHistoryDTO; import com.hnac.hzims.message.entity.MsgWsRecordHistoryEntity; import com.hnac.hzims.message.mapper.MsgWsRecordHistoryMapper; import com.hnac.hzims.message.service.IMsgWsRecordHistoryService; import com.hnac.hzims.message.vo.MsgWsRecordHistoryVO; import com.hnac.hzims.message.wrapper.MsgWsRecordHistoryWrapper; -import org.apache.commons.lang.StringUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -22,7 +23,7 @@ import org.springframework.stereotype.Service; * @created 2021-06-28 16:45 **/ @Service -public class MsgWsRecordHistoryServiceImpl extends BaseServiceImpl implements IMsgWsRecordHistoryService { +public class MsgWsRecordHistoryServiceImpl extends ServiceImpl implements IMsgWsRecordHistoryService { @Autowired private MsgWsRecordHistoryMapper mapper; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordServiceImpl.java index bd0aba0..9cfc5ee 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MsgWsRecordServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.message.vo.UnreadMsgCountVO; import com.hnac.hzims.message.wrapper.MsgWsRecordWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -28,7 +28,7 @@ import java.util.List; @AllArgsConstructor @Slf4j @Service -public class MsgWsRecordServiceImpl extends BaseServiceImpl implements IMsgWsRecordService { +public class MsgWsRecordServiceImpl extends ServiceImpl implements IMsgWsRecordService { private final MsgWsRecordMapper mapper; private final IMsgWsRecordHistoryService historyService; diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessageServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessageServiceImpl.java index b094107..d847666 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessageServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessageServiceImpl.java @@ -18,7 +18,7 @@ import com.hnac.hzinfo.core.push.model.PushResponse; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; 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.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -47,7 +47,6 @@ import java.util.concurrent.atomic.AtomicReference; public class PushMessageServiceImpl implements IMessageService { private final IPushClient pushClient; - private final BladeLogger logger; private final ExecutorService appMessagePushExecutor; private final RedisTemplate redisTemplate; @Value("${hzims.message.redis-key.app-push}") diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessagesServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessagesServiceImpl.java index 1e005c7..cb44ed9 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessagesServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/PushMessagesServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.message.entity.PushMessageEntity; import com.hnac.hzims.message.mapper.PushMessageMapper; import com.hnac.hzims.message.service.IPushMessageService; 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.Func; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import java.util.List; */ @Slf4j @Service -public class PushMessagesServiceImpl extends BaseServiceImpl implements IPushMessageService { +public class PushMessagesServiceImpl extends ServiceImpl implements IPushMessageService { @Override public List list(PushMessageDTO pushMessageDTO) { diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java index dd4e03e..3d08b6e 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java @@ -19,7 +19,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; 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.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -55,7 +55,6 @@ public class WxMessageServiceImpl implements IMessageService { private final IPushClient pushClient; private final IWxPushClient wxPushClient; - private final BladeLogger logger; private final ExecutorService appMessagePushExecutor; @Override diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgPushRecordController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgPushRecordController.java index 23f5514..512478b 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgPushRecordController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgPushRecordController.java @@ -38,7 +38,7 @@ public class MsgPushRecordController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgSmsRecordController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgSmsRecordController.java index d670fc8..f55d1e5 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgSmsRecordController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgSmsRecordController.java @@ -38,7 +38,7 @@ public class MsgSmsRecordController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordController.java index 0a48713..20d6e4a 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordController.java @@ -41,7 +41,7 @@ public class MsgWsRecordController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordHistoryController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordHistoryController.java index a800d2b..05a9952 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordHistoryController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordHistoryController.java @@ -36,7 +36,7 @@ public class MsgWsRecordHistoryController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } // // /** diff --git a/hzims-service/message/src/main/resources/template/template.yml b/hzims-service/message/src/main/resources/template/template.yml new file mode 100644 index 0000000..b01bc50 --- /dev/null +++ b/hzims-service/message/src/main/resources/template/template.yml @@ -0,0 +1,71 @@ +#服务器端口 +server: + port: 8215 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_message?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} + mail: + enabled: true + host: "smtp.qq.com" + username: "503684646@qq.com" + password: "vfqsqlojaiqrbjgj" + port: 587 + default-encoding: "UTF-8" + properties: + mail: + smtp: + socketFactoryClass: "javax.net.ssl.SSLSocketFactory" + debug: false +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.message,org.springbalde,com.hnac + +xxl: + job: + accessToken: '' + admin: + addresses: "http://${hzims.server.ip}:7009/xxl-job-admin" + executor: + appname: hzims-message + ip: "${hzims.server.ip}" + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: -1 + port: 28215 + + +hzims: + # 推送策略 + push-strategy: + concentrateDuration: 10 + concentrateUnit: minuter \ No newline at end of file diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 8699334..f542203 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -93,7 +93,7 @@ redis.clients jedis - 2.9.3 + 3.6.0 com.xuxueli diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java index 6a4175c..b84ae95 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java @@ -19,9 +19,10 @@ package com.hnac.hzims.operational; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; + +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import javax.annotation.Resource; @@ -31,21 +32,22 @@ import javax.annotation.Resource; * * @author Chill */ -@EnableBladeFeign -@SpringCloudApplication +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) +@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @MapperScan("com.hnac.hzims.**.mapper.**") @ComponentScan(basePackages = {"com.hnac.*"}) @Resource -public class OperationApplication extends SpringBootServletInitializer { +public class OperationApplication { public static void main(String[] args) { BladeApplication.run(OperationalConstants.APP_NAME, OperationApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, OperationalConstants.APP_NAME, OperationApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, OperationalConstants.APP_NAME, OperationApplication.class); +// } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java index 2debf7c..6eff952 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java @@ -15,7 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -45,7 +45,7 @@ public class AccessPlanV4Controller extends BladeController { } - @ApiLog + @GetMapping("/pages") @ApiOperationSupport(order = 2) @ApiOperation(value = "检修计划分页查询") @@ -55,7 +55,7 @@ public class AccessPlanV4Controller extends BladeController { } - @ApiLog + @GetMapping("/export") @ApiOperationSupport(order = 3) @ApiOperation(value = "检修任务导出") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessTaskV4Controller.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessTaskV4Controller.java index 3172153..cc3a261 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessTaskV4Controller.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessTaskV4Controller.java @@ -15,7 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; @@ -35,7 +35,7 @@ public class AccessTaskV4Controller extends BladeController { private final AccessTaskV4Service accessTaskV4Service; - @ApiLog + @GetMapping("/myAccessTasks") @ApiOperationSupport(order = 1) @ApiOperation(value = "我的检修任务") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/ConstructionController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/ConstructionController.java index 85a2a11..a78899d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/ConstructionController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/ConstructionController.java @@ -53,7 +53,7 @@ public class ConstructionController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "施工日志删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } @GetMapping("/detail") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java index 7e290f5..9f924d9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessBaseMaterialController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -39,7 +39,7 @@ public class OperAccessBaseMaterialController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -65,7 +65,7 @@ public class OperAccessBaseMaterialController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -76,7 +76,7 @@ public class OperAccessBaseMaterialController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:typeCode,name,model,unit") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java index 9fb886d..c0ae6dd 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -39,7 +39,7 @@ public class OperAccessContentController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -65,7 +65,7 @@ public class OperAccessContentController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -76,7 +76,7 @@ public class OperAccessContentController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:name,emCode,gradeCode,manager") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java index 9f796e4..493f5d5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessContentDetailController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -39,7 +39,7 @@ public class OperAccessContentDetailController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -65,7 +65,7 @@ public class OperAccessContentDetailController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -76,7 +76,7 @@ public class OperAccessContentDetailController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:contentId") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java index 092ee87..dca83b9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -50,7 +50,7 @@ public class OperAccessLibraryController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修库删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -78,7 +78,7 @@ public class OperAccessLibraryController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 4) @ApiOperation(value = "详情") @@ -90,7 +90,7 @@ public class OperAccessLibraryController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 5) @ApiOperation(value = "分页 查询参数:emCode,gradeCode") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java index 17719f6..62ec93c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryDetailController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -48,7 +48,7 @@ public class OperAccessLibraryDetailController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修库明细删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -76,7 +76,7 @@ public class OperAccessLibraryDetailController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -88,7 +88,7 @@ public class OperAccessLibraryDetailController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:pid,name") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java index b49fd65..987c2d2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessMaterialController.java @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -46,7 +46,7 @@ public class OperAccessMaterialController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修材料删除",type = BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -74,7 +74,7 @@ public class OperAccessMaterialController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -86,7 +86,7 @@ public class OperAccessMaterialController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:materialId,planId") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java index 4a877da..7d028c7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessPlanController.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -63,7 +63,7 @@ public class OperAccessPlanController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") 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))); } /** @@ -100,7 +100,7 @@ public class OperAccessPlanController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -121,7 +121,7 @@ public class OperAccessPlanController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "检修管理",title = "检修计划",operatorType = OperatorType.MOBILE,businessType = @@ -166,7 +166,7 @@ public class OperAccessPlanController extends BladeController { // } // return R.data(userList); // } - @ApiLog + @GetMapping("/getUserByRoleAlias") @ApiOperationSupport(order = 80) @ApiOperation(value = "根据角色别称获取人员列表") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java index ba3f2a3..3ee748e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -49,7 +49,7 @@ public class OperAccessStatisticsController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修台账删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -88,7 +88,7 @@ public class OperAccessStatisticsController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:pid,taskId,manager") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java index b0403c4..9d0c08b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -59,7 +59,7 @@ public class OperAccessTaskController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修任务删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -87,7 +87,7 @@ public class OperAccessTaskController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -100,7 +100,7 @@ public class OperAccessTaskController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "检修管理",title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType = @@ -115,7 +115,7 @@ public class OperAccessTaskController extends BladeController { /** * 分页 */ - @ApiLog + @PostMapping("/listByStatus") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "检修管理",title = "检修任务",operatorType = OperatorType.MOBILE,businessType = @@ -133,7 +133,7 @@ public class OperAccessTaskController extends BladeController { /** * 获取检修台账 */ - @ApiLog + @GetMapping("/getRepairBill") @ApiOperationSupport(order = 60) @ApiOperation(value = "获取检修台账") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java index baa10ea..6e32c0c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskDetailController.java @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -46,7 +46,7 @@ public class OperAccessTaskDetailController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "检修任务明细删除",type = BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) 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))); } /** @@ -85,7 +85,7 @@ public class OperAccessTaskDetailController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:taskId,name") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/excel/BaseExport.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/excel/BaseExport.java index 0479d4b..00a3c93 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/excel/BaseExport.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/excel/BaseExport.java @@ -1,6 +1,7 @@ package com.hnac.hzims.operational.access.excel; -import org.apache.commons.lang.StringUtils; + +import com.hnac.hzims.common.logs.utils.StringUtils; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.java index d8a8d8a..35066e4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/feign/OperAccessTaskClient.java @@ -14,7 +14,7 @@ import com.hnac.hzims.operational.feign.IAccessTaskClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; @@ -56,7 +56,6 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC private final IFlowClient flowClient; private final RedisTemplate redisTemplate; private final IUserClient userClient; - private final BladeLogger bladeLogger; @Value("${hzims.operation.access.task-key}") private String taskKey; @@ -114,7 +113,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC @GetMapping("/billing") public R billing(@RequestParam Long taskId) { OperAccessTaskEntity taskEntity = taskService.getById(taskId); - bladeLogger.info("AccessTask:billing",String.format("%s:%s",taskId,JSON.toJSONString(taskEntity))); + log.info("AccessTask:billing",String.format("%s:%s",taskId,JSON.toJSONString(taskEntity))); if(ObjectUtil.isNotEmpty(taskEntity) && Func.isNotEmpty(taskEntity.getPhenomenonId())) { OperPhenomenonEntity phenomenonEntity = phenomenonService.getById(taskEntity.getPhenomenonId()); String processInstanceId = phenomenonEntity.getCheckProcessInstanceId(); @@ -158,7 +157,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC @PostMapping("/finishTask") @Transactional(rollbackFor = Exception.class) public R finishTask(OperAccessTaskDTO taskDto) { - bladeLogger.info(String.format("%s:%s","operational","executeAccessTask"), JSON.toJSONString(taskDto)); + log.info(String.format("%s:%s","operational","executeAccessTask"), JSON.toJSONString(taskDto)); LambdaUpdateWrapper luw = Wrappers.lambdaUpdate() .set(OperAccessTaskEntity::getActEndTime,LocalDateTime.now()) .set(OperAccessTaskEntity::getActHours,taskDto.getActHours()) @@ -182,10 +181,10 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC //@Transactional(rollbackFor = Exception.class) public void executeAccessTask(OperAccessTaskEntity accessTaskEntity) { R flowTaskResult = flowClient.getTaskByProcessInstanceIdAndUserId(accessTaskEntity.getProcessInstanceId(),"taskUser_"+accessTaskEntity.getHandler()); - bladeLogger.info(String.format("%s:%s","executeAccessTask","flowTask"), JSON.toJSONString(flowTaskResult)); + log.info(String.format("%s:%s","executeAccessTask","flowTask"), JSON.toJSONString(flowTaskResult)); Assert.isTrue(flowTaskResult.isSuccess() && ObjectUtil.isNotEmpty(flowTaskResult.getData()),()->{ String message = "查询当前检修任务工作流任务失败！"; - bladeLogger.error("operational:access:executeAccessTask",message); + log.error("operational:access:executeAccessTask",message); throw new ServiceException(message); }); ComleteTask comleteTask = new ComleteTask(); @@ -199,7 +198,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC R> userListResult = userClient.relationUserListByRoleAlias(accessTaskEntity.getTenantId(),accessTaskEntity.getCreateDept(),AccessConstants.TASK_REVIEWER); Assert.isTrue(userListResult.isSuccess() && ObjectUtil.isNotEmpty(userListResult.getData()),()-> { String message = "未查询到审批人角色下的人员"; - bladeLogger.error("operational:access:executeAccessTask",message); + log.error("operational:access:executeAccessTask",message); throw new ServiceException(message); }); String reviewer = userListResult.getData().stream().map(user -> "taskUser_" + user.getId().toString()).collect(Collectors.joining(",")); @@ -218,7 +217,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC */ //@Transactional(rollbackFor = Exception.class) public void dealDefect(OperAccessTaskEntity accessTaskEntity) { - bladeLogger.info(String.format("%s:%s","dealDefect",accessTaskEntity.getId()), JSON.toJSONString(accessTaskEntity)); + log.info(String.format("%s:%s","dealDefect",accessTaskEntity.getId()), JSON.toJSONString(accessTaskEntity)); if(Func.isNotEmpty(accessTaskEntity.getPhenomenonId())) { OperPhenomenonEntity phenomenonEntity = phenomenonService.getById(accessTaskEntity.getPhenomenonId()); Assert.isTrue(ObjectUtil.isNotEmpty(phenomenonEntity),()->{ @@ -235,7 +234,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC R instanceIdAndUserId = flowClient.getTaskByProcessInstanceIdAndUserId(processInstanceId, userId); Assert.isTrue(instanceIdAndUserId.isSuccess() && ObjectUtil.isNotEmpty(instanceIdAndUserId.getData()),()->{ String message = "获取现象当前流程任务ID失败，失败信息为："+instanceIdAndUserId.getMsg(); - bladeLogger.error("operational:access:dealDefect",message); + log.error("operational:access:dealDefect",message); throw new ServiceException(message); }); comleteTask.setTaskId(instanceIdAndUserId.getData().getTaskId()); @@ -244,7 +243,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC R> userListR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), accessTaskEntity.getCreateDept(), AccessConstants.TASK_REVIEWER); Assert.isTrue(userListR.isSuccess() && ObjectUtil.isNotEmpty(userListR.getData()),()->{ String message = "获取检修任务任务审核人失败，报错信息为："+userListR.getMsg(); - bladeLogger.error("operational:access:dealDefect",message); + log.error("operational:access:dealDefect",message); throw new ServiceException(message); }); //查询任务审批人是否存在 @@ -255,7 +254,7 @@ public class OperAccessTaskClient implements IOperAccessTaskClient, IAccessTaskC R completeTask = flowClient.completeTask(comleteTask); Assert.isTrue(completeTask.isSuccess(),()->{ String message = "执行消缺流程失败，失败信息为："+completeTask.getMsg(); - bladeLogger.error("operational:access:dealDefect",message); + log.error("operational:access:dealDefect",message); throw new ServiceException(message); }); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java index 900d3d4..08581a5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.access.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.hnac.hzims.operational.access.vo.AccessTaskExportVo; import com.hnac.hzims.operational.access.vo.RepairBillVO; import org.springblade.core.datascope.annotation.UserDataAuth; @@ -34,7 +34,7 @@ public interface OperAccessTaskMapper extends UserDataScopeBaseMapper selectByEmCode(String emCode,List list); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List getAccessTaskByDisposer(Map params); List selectAccessTask(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("list")List list); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/ConstructionService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/ConstructionService.java index 575a60a..0ee9a86 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/ConstructionService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/ConstructionService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.entity.OperConstructionEntity; import com.hnac.hzims.operational.access.vo.ConstructionVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; /** * @author ysj */ -public interface ConstructionService extends BaseService { +public interface ConstructionService extends IService { boolean accessSave(OperConstructionEntity entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessBaseMaterialService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessBaseMaterialService.java index 63fab71..6c20858 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessBaseMaterialService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessBaseMaterialService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessBaseMaterialDTO; import com.hnac.hzims.operational.access.entity.OperAccessBaseMaterialEntity; import com.hnac.hzims.operational.access.vo.OperAccessBaseMaterialVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.multipart.MultipartFile; @@ -15,7 +16,7 @@ import org.springframework.web.multipart.MultipartFile; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessBaseMaterialService extends BaseService { +public interface IOperAccessBaseMaterialService extends IService { R doSave(OperAccessBaseMaterialDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentDetailService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentDetailService.java index d2175d2..65743de 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentDetailService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentDetailService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessContentDetailDTO; import com.hnac.hzims.operational.access.entity.OperAccessContentDetailEntity; import com.hnac.hzims.operational.access.vo.OperAccessContentDetailVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-05-17 15:12 **/ -public interface IOperAccessContentDetailService extends BaseService { +public interface IOperAccessContentDetailService extends IService { R doSave(OperAccessContentDetailDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentService.java index 4137669..5c2fe4a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessContentService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessContentDTO; import com.hnac.hzims.operational.access.entity.OperAccessContentEntity; import com.hnac.hzims.operational.access.vo.OperAccessContentVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessContentService extends BaseService { +public interface IOperAccessContentService extends IService { R doSave(OperAccessContentDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryDetailService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryDetailService.java index 30ec9a8..a63d7d3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryDetailService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryDetailService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessLibraryDetailDTO; import com.hnac.hzims.operational.access.entity.OperAccessLibraryDetailEntity; import com.hnac.hzims.operational.access.vo.OperAccessLibraryDetailVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessLibraryDetailService extends BaseService { +public interface IOperAccessLibraryDetailService extends IService { R doSave(OperAccessLibraryDetailDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java index 8d94f2c..9232829 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessLibraryDTO; import com.hnac.hzims.operational.access.dto.OperAccessLibraryListDTO; import com.hnac.hzims.operational.access.entity.OperAccessLibraryEntity; import com.hnac.hzims.operational.access.vo.OperAccessLibraryVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.multipart.MultipartFile; @@ -18,7 +19,7 @@ import java.io.IOException; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessLibraryService extends BaseService { +public interface IOperAccessLibraryService extends IService { R doSave(OperAccessLibraryDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessMaterialService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessMaterialService.java index 38426ce..7b70ee8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessMaterialService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessMaterialService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessMaterialDTO; import com.hnac.hzims.operational.access.entity.OperAccessMaterialEntity; import com.hnac.hzims.operational.access.vo.MaterialConsumeVO; import com.hnac.hzims.operational.access.vo.OperAccessMaterialVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.List; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessMaterialService extends BaseService { +public interface IOperAccessMaterialService extends IService { R doSave(OperAccessMaterialDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessPlanService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessPlanService.java index 9ee8838..0742acf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessPlanService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessPlanService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessPlanDTO; import com.hnac.hzims.operational.access.dto.OperAccessPlanListDTO; import com.hnac.hzims.operational.access.entity.OperAccessMaterialEntity; import com.hnac.hzims.operational.access.entity.OperAccessPlanEntity; import com.hnac.hzims.operational.access.vo.OperAccessPlanVO; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketTemplateEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -20,7 +21,7 @@ import java.util.List; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessPlanService extends BaseService { +public interface IOperAccessPlanService extends IService { R doSave(OperAccessPlanDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessStatisticsService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessStatisticsService.java index 417d9ca..8feff0f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessStatisticsService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessStatisticsService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessStatisticsDTO; import com.hnac.hzims.operational.access.entity.OperAccessStatisticsEntity; import com.hnac.hzims.operational.access.vo.OperAccessStatisticsVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import javax.servlet.http.HttpServletResponse; @@ -15,7 +16,7 @@ import javax.servlet.http.HttpServletResponse; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessStatisticsService extends BaseService { +public interface IOperAccessStatisticsService extends IService { R doSave(OperAccessStatisticsDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskDetailService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskDetailService.java index df61bf5..4d08128 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskDetailService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskDetailService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessTaskDetailDTO; import com.hnac.hzims.operational.access.entity.OperAccessTaskDetailEntity; import com.hnac.hzims.operational.access.vo.OperAccessTaskDetailVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import org.springblade.core.tool.api.R; * @author xiashandong * @created 2021-05-17 15:12 **/ -public interface IOperAccessTaskDetailService extends BaseService { +public interface IOperAccessTaskDetailService extends IService { R doSave(OperAccessTaskDetailDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java index 75ba489..6b59ad5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java @@ -2,6 +2,7 @@ package com.hnac.hzims.operational.access.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.vo.AccessTaskExportVo; @@ -11,7 +12,7 @@ import com.hnac.hzims.operational.report.vo.AccessReportVO; import com.hnac.hzims.operational.report.vo.AccessRunReportVO; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -26,7 +27,7 @@ import java.util.Map; * @author xiashandong * @created 2021-04-28 13:14 **/ -public interface IOperAccessTaskService extends BaseService { +public interface IOperAccessTaskService extends IService { R doSave(OperAccessTaskDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java index 9784937..8a7147c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java @@ -157,7 +157,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ }}); log.error("save_access_material : {}",materials); if(CollectionUtil.isNotEmpty(materials)){ - materialService.deleteLogic(materials.stream().map(OperAccessMaterialEntity::getId).collect(Collectors.toList())); + materialService.removeByIds(materials.stream().map(OperAccessMaterialEntity::getId).collect(Collectors.toList())); } for (OperAccessMaterialDTO material : entity.getAccessMaterials()){ material.setId(null); @@ -182,7 +182,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ eq(OperAccessContentEntity::getIsDeleted, 0L); }}); if(CollectionUtil.isNotEmpty(exists)){ - contentService.deleteLogic(exists.stream().map(OperAccessContentEntity::getId).collect(Collectors.toList())); + contentService.removeByIds(exists.stream().map(OperAccessContentEntity::getId).collect(Collectors.toList())); } for (OperAccessContentDTO detail : entity.getAccessContents()){ detail.setPlanId(entity.getId()); @@ -195,7 +195,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ }}); // 先删除 if(CollectionUtil.isNotEmpty(contentDetails)){ - contentDetailService.deleteLogic(contentDetails.stream().map(OperAccessContentDetailEntity::getId).collect(Collectors.toList())); + contentDetailService.removeByIds(contentDetails.stream().map(OperAccessContentDetailEntity::getId).collect(Collectors.toList())); } // 再保存 contentDetail.setId(null); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java index 5bbab8e..b46179f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java @@ -150,7 +150,7 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service { eq(OperAccessMaterialEntity::getIsDeleted, 0L); }}); if(CollectionUtil.isNotEmpty(exists)){ - materialService.deleteLogic(exists.stream().map(OperAccessMaterialEntity::getId).collect(Collectors.toList())); + materialService.removeByIds(exists.stream().map(OperAccessMaterialEntity::getId).collect(Collectors.toList())); } for (OperAccessMaterialEntity material : entity.getAccessMaterials()){ material.setId(null); @@ -176,7 +176,7 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service { eq(OperAccessTaskDetailEntity::getIsDeleted, 0L); }}); if(CollectionUtil.isNotEmpty(exists)){ - detailService.deleteLogic(exists.stream().map(OperAccessTaskDetailEntity::getId).collect(Collectors.toList())); + detailService.removeByIds(exists.stream().map(OperAccessTaskDetailEntity::getId).collect(Collectors.toList())); } for (OperAccessTaskDetailDTO detail : entity.getAccessTaskDetails()){ detail.setId(null); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/ConstructionServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/ConstructionServiceImpl.java index cbd3fa6..014f188 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/ConstructionServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/ConstructionServiceImpl.java @@ -16,7 +16,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; 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.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; @@ -40,7 +40,7 @@ import java.util.Map; @Service @Slf4j @RequiredArgsConstructor -public class ConstructionServiceImpl extends BaseServiceImpl implements ConstructionService { +public class ConstructionServiceImpl extends ServiceImpl implements ConstructionService { private final IOperAccessTaskService accessTaskService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessBaseMaterialServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessBaseMaterialServiceImpl.java index 45abb52..7004930 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessBaseMaterialServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessBaseMaterialServiceImpl.java @@ -3,14 +3,15 @@ package com.hnac.hzims.operational.access.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.access.dto.OperAccessBaseMaterialDTO; import com.hnac.hzims.operational.access.entity.OperAccessBaseMaterialEntity; import com.hnac.hzims.operational.access.mapper.OperAccessBaseMaterialMapper; import com.hnac.hzims.operational.access.service.IOperAccessBaseMaterialService; import com.hnac.hzims.operational.access.vo.OperAccessBaseMaterialVO; import com.hnac.hzims.operational.access.wrapper.OperAccessBaseMaterialWrapper; -import org.apache.commons.lang.StringUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -21,7 +22,7 @@ import org.springframework.stereotype.Service; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessBaseMaterialServiceImpl extends BaseServiceImpl implements IOperAccessBaseMaterialService { +public class OperAccessBaseMaterialServiceImpl extends ServiceImpl implements IOperAccessBaseMaterialService { @Override public R doSave(OperAccessBaseMaterialDTO req) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentDetailServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentDetailServiceImpl.java index f2b1c51..6f0ac3b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentDetailServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentDetailServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.access.mapper.OperAccessContentDetailMapper; import com.hnac.hzims.operational.access.service.IOperAccessContentDetailService; import com.hnac.hzims.operational.access.vo.OperAccessContentDetailVO; import com.hnac.hzims.operational.access.wrapper.OperAccessContentDetailWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; * @created 2021-05-17 15:12 **/ @Service -public class OperAccessContentDetailServiceImpl extends BaseServiceImpl implements IOperAccessContentDetailService { +public class OperAccessContentDetailServiceImpl extends ServiceImpl implements IOperAccessContentDetailService { @Autowired private OperAccessContentDetailMapper mapper; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentServiceImpl.java index d428e42..49f28f3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessContentServiceImpl.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.access.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.access.dto.OperAccessContentDTO; import com.hnac.hzims.operational.access.dto.OperAccessContentDetailDTO; @@ -15,8 +16,8 @@ import com.hnac.hzims.operational.access.vo.OperAccessContentVO; import com.hnac.hzims.operational.access.wrapper.OperAccessContentDetailWrapper; import com.hnac.hzims.operational.access.wrapper.OperAccessContentWrapper; import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; -import org.apache.commons.lang.StringUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -34,7 +35,7 @@ import java.util.stream.Collectors; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessContentServiceImpl extends BaseServiceImpl implements IOperAccessContentService { +public class OperAccessContentServiceImpl extends ServiceImpl implements IOperAccessContentService { @Autowired private IEmInfoClient emInfoClient; @Autowired @@ -112,7 +113,7 @@ public class OperAccessContentServiceImpl extends BaseServiceImpl detailIds = details.stream().filter(o -> o.getId() != null).map(OperAccessContentDetailDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessContentDetailEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - contentDetailService.deleteLogic(ids); + contentDetailService.removeByIds(ids); } //新增或修改操作 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryDetailServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryDetailServiceImpl.java index 2df9237..7ac1427 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryDetailServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryDetailServiceImpl.java @@ -3,14 +3,15 @@ package com.hnac.hzims.operational.access.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.access.dto.OperAccessLibraryDetailDTO; import com.hnac.hzims.operational.access.entity.OperAccessLibraryDetailEntity; import com.hnac.hzims.operational.access.mapper.OperAccessLibraryDetailMapper; import com.hnac.hzims.operational.access.service.IOperAccessLibraryDetailService; import com.hnac.hzims.operational.access.vo.OperAccessLibraryDetailVO; import com.hnac.hzims.operational.access.wrapper.OperAccessLibraryDetailWrapper; -import org.apache.commons.lang.StringUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -22,7 +23,7 @@ import org.springframework.stereotype.Service; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessLibraryDetailServiceImpl extends BaseServiceImpl implements IOperAccessLibraryDetailService { +public class OperAccessLibraryDetailServiceImpl extends ServiceImpl implements IOperAccessLibraryDetailService { @Autowired private OperAccessLibraryDetailMapper mapper; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java index 57daf5f..019096a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.nacos.client.config.NacosConfigService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.access.dto.OperAccessLibraryDTO; import com.hnac.hzims.operational.access.dto.OperAccessLibraryDetailDTO; @@ -20,14 +21,14 @@ import com.hnac.hzims.operational.access.wrapper.OperAccessLibraryWrapper; import com.hnac.hzims.operational.util.ExcelUtil; import com.hnac.hzims.operational.util.PdfUtils; import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; -import org.apache.commons.lang.StringUtils; + import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; 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.Query; import org.springblade.core.tool.api.R; @@ -57,7 +58,7 @@ import java.util.stream.Collectors; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessLibraryServiceImpl extends BaseServiceImpl implements IOperAccessLibraryService { +public class OperAccessLibraryServiceImpl extends ServiceImpl implements IOperAccessLibraryService { private int counter = 2; @Autowired @@ -238,7 +239,7 @@ public class OperAccessLibraryServiceImpl extends BaseServiceImpl detailIds = libraryDetails.stream().filter(o -> o.getId() != null).map(OperAccessLibraryDetailDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessLibraryDetailEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - libraryDetailService.deleteLogic(ids); + libraryDetailService.removeByIds(ids); } //新增或修改操作 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessMaterialServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessMaterialServiceImpl.java index 4c9ab04..00bf1a4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessMaterialServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessMaterialServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.operational.access.service.IOperAccessMaterialService; import com.hnac.hzims.operational.access.vo.MaterialConsumeVO; import com.hnac.hzims.operational.access.vo.OperAccessMaterialVO; import com.hnac.hzims.operational.access.wrapper.OperAccessMaterialWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -26,7 +26,7 @@ import java.util.List; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessMaterialServiceImpl extends BaseServiceImpl implements IOperAccessMaterialService { +public class OperAccessMaterialServiceImpl extends ServiceImpl implements IOperAccessMaterialService { @Autowired private OperAccessMaterialMapper mapper; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessPlanServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessPlanServiceImpl.java index 83ef3c1..003595c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessPlanServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessPlanServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.message.req.PushExtrasReq; import com.hnac.hzims.operational.access.constants.AccessConstants; @@ -32,10 +33,10 @@ import com.hnac.hzims.ticket.workTicket.entity.WorkTicketTemplateEntity; import com.hnac.hzims.ticket.workTicket.feign.IWorkTicketTemplateClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.RandomUtils; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -69,7 +70,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class OperAccessPlanServiceImpl extends BaseServiceImpl implements IOperAccessPlanService { +public class OperAccessPlanServiceImpl extends ServiceImpl implements IOperAccessPlanService { private final HttpServletResponse httpServletResponse; private final IFlowClient flowClient; private final IEmInfoClient emInfoClient; @@ -347,7 +348,7 @@ public class OperAccessPlanServiceImpl extends BaseServiceImpl detailIds = materials.stream().filter(o -> o.getId() != null).map(OperAccessMaterialDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessMaterialEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - materialService.deleteLogic(ids); + materialService.removeByIds(ids); } //新增或修改操作 @@ -522,7 +523,7 @@ public class OperAccessPlanServiceImpl extends BaseServiceImpl detailIds = contents.stream().filter(o -> o.getId() != null).map(OperAccessContentDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessContentEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - contentService.deleteLogic(ids); + contentService.removeByIds(ids); } //新增或修改操作 for (OperAccessContentDTO req : contents) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java index a2ca293..57ec784 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.operational.access.service.IOperAccessStatisticsService; import com.hnac.hzims.operational.access.vo.OperAccessStatisticsVO; import com.hnac.hzims.operational.access.wrapper.OperAccessStatisticsWrapper; import org.apache.poi.ss.usermodel.Workbook; -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.Query; import org.springblade.core.secure.BladeUser; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * @created 2021-04-28 13:14 **/ @Service -public class OperAccessStatisticsServiceImpl extends BaseServiceImpl implements IOperAccessStatisticsService { +public class OperAccessStatisticsServiceImpl extends ServiceImpl implements IOperAccessStatisticsService { @Autowired private HttpServletResponse httpServletResponse; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskDetailServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskDetailServiceImpl.java index 4927275..b0ea749 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskDetailServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskDetailServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.operational.access.mapper.OperAccessTaskDetailMapper; import com.hnac.hzims.operational.access.service.IOperAccessTaskDetailService; import com.hnac.hzims.operational.access.vo.OperAccessTaskDetailVO; import com.hnac.hzims.operational.access.wrapper.OperAccessTaskDetailWrapper; -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.Query; import org.springblade.core.secure.BladeUser; @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; * @created 2021-05-17 15:12 **/ @Service -public class OperAccessTaskDetailServiceImpl extends BaseServiceImpl implements IOperAccessTaskDetailService { +public class OperAccessTaskDetailServiceImpl extends ServiceImpl implements IOperAccessTaskDetailService { @Autowired private OperAccessTaskDetailMapper mapper; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java index 8504ca8..19025a6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java @@ -48,7 +48,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; 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.Query; import org.springblade.core.secure.BladeUser; @@ -85,7 +85,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class OperAccessTaskServiceImpl extends BaseServiceImpl implements IOperAccessTaskService { +public class OperAccessTaskServiceImpl extends ServiceImpl implements IOperAccessTaskService { private final IFlowClient flowClient; private final IDangerSourceClient dangerSourceClient; private final IOperAccessTaskDetailService detailService; @@ -363,7 +363,7 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl detailIds = details.stream().filter(o -> o.getId() != null).map(OperAccessTaskDetailDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessTaskDetailEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - detailService.deleteLogic(ids); + detailService.removeByIds(ids); } //新增或修改操作 @@ -399,7 +399,7 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl detailIds = materials.stream().filter(o -> o.getId() != null).map(OperAccessMaterialDTO::getId).collect(Collectors.toSet()); List ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessMaterialEntity::getId).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(ids)) { - materialService.deleteLogic(ids); + materialService.removeByIds(ids); } if (CollectionUtil.isNotEmpty(materials)) { List materialEntityList = JSONArray.parseArray(JSON.toJSONString(materials), OperAccessMaterialEntity.class); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/AreaDutyController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/AreaDutyController.java index 8cda40d..c15c870 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/AreaDutyController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/AreaDutyController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -30,7 +30,7 @@ public class AreaDutyController { private final IImsDutyMainService dutyMainService; - @ApiLog + @ApiOperation("值班数据") @GetMapping("/duty") @ApiOperationSupport(order = 1) @@ -38,7 +38,7 @@ public class AreaDutyController { return R.data(service.duty(deptId)); } - @ApiLog + @ApiOperation("资产信息") @GetMapping("/asset") @ApiOperationSupport(order = 2) @@ -46,7 +46,7 @@ public class AreaDutyController { return R.data(service.asset(deptId)); } - @ApiLog + @ApiOperation("及时提醒消息") @GetMapping("/timely") @ApiOperationSupport(order = 3) @@ -54,7 +54,7 @@ public class AreaDutyController { return R.data(service.timely(deptId)); } - @ApiLog + @ApiOperation("排班数据") @GetMapping("/scheduling") @ApiOperationSupport(order = 4) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java index c0f3299..5a5eafa 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/CensusController.java @@ -6,7 +6,7 @@ import com.hnac.hzims.operational.census.vo.WaterFlowVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -26,7 +26,7 @@ public class CensusController { private final CensusService service; - @ApiLog + @ApiOperation("水位-流量统计") @PostMapping("/water-flow") @ApiOperationSupport(order = 1) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java index 7ff523b..f71c869 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java @@ -15,7 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -55,7 +55,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("计划发电量/实际发电量统计:区分填报/接入站点") @PostMapping("/complete-generation") @ApiOperationSupport(order = 3) @@ -66,7 +66,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("两票统计:区分填报/平台业务数据") @PostMapping("/complete-ticket") @ApiOperationSupport(order = 4) @@ -76,7 +76,7 @@ public class TargetController { return R.data(service.completeTicket(Condition.getPage(query),areaName,type)); } - @ApiLog + @ApiOperation("缺陷率统计:区分填报/平台业务数据") @GetMapping("/complete-defect") @ApiOperationSupport(order = 5) @@ -87,7 +87,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("上线率/Fa投入条数统计") @GetMapping("/complete-other") @ApiOperationSupport(order = 6) @@ -98,7 +98,7 @@ public class TargetController { return R.data(service.completeOther(Condition.getPage(query),stationName,type,queryType)); } - @ApiLog + @ApiOperation("日常维护统计") @GetMapping("/routine-maintenance") @ApiOperationSupport(order = 7) @@ -109,7 +109,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("检修任务统计") @GetMapping("/examine-repair") @ApiOperationSupport(order = 8) @@ -120,7 +120,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("检修卡统计") @GetMapping("/examineCard") @ApiOperationSupport(order = 9) @@ -130,7 +130,7 @@ public class TargetController { return R.data(service.examineCard(Condition.getPage(query),stationName,type)); } - @ApiLog + @ApiOperation("设备统计") @GetMapping("/device-classify") @ApiOperationSupport(order = 10) @@ -142,7 +142,7 @@ public class TargetController { } - @ApiLog + @ApiOperation("水电集团、区域指标关联") @GetMapping("/hydropower-target") @ApiOperationSupport(order = 11) @@ -153,7 +153,7 @@ public class TargetController { return R.data(service.hydropowerTarget(Condition.getPage(query),stationName,deptId,target)); } - @ApiLog + @ApiOperation("水电关联-发电详情") @GetMapping("/hydropower-target-detail") @ApiOperationSupport(order = 11) @@ -162,7 +162,7 @@ public class TargetController { return R.data(service.hydropowerTargetDetail(stationName,type)); } - @ApiLog + @ApiOperation("水利集团、区域指标关联") @GetMapping("/water-target") @ApiOperationSupport(order = 12) @@ -173,7 +173,7 @@ public class TargetController { return R.data(service.waterTarget(Condition.getPage(query),stationName,deptId,target)); } - @ApiLog + @ApiOperation("光伏集团、区域指标关联") @GetMapping("/photovoltaic-target") @ApiOperationSupport(order = 13) @@ -184,7 +184,7 @@ public class TargetController { return R.data(service.photovoltaicTarget(Condition.getPage(query),stationName,deptId,target)); } - @ApiLog + @ApiOperation("集团当班数据") @GetMapping("/duty-group") @ApiOperationSupport(order = 14) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java index 91c2a11..b7a4e7b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java @@ -1,9 +1,5 @@ package com.hnac.hzims.operational.census.service.impl; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.esotericsoftware.minlog.Log; -import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.message.dto.WxMessageDTO; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.census.service.DeviceDataService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java index 971515b..09043ec 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java @@ -12,7 +12,6 @@ import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * @Author WL @@ -44,7 +43,8 @@ public class Swagger2Config implements WebMvcConfigurer { .apiInfo(webApiInfo()) .select() //只显示api路径下的页面 - .paths(Predicates.and(PathSelectors.regex("/areaMonthlyDetails/.*"))) + //todo tyty +// .paths(Predicates.and(PathSelectors.regex("/areaMonthlyDetails/.*"))) .build(); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/AreaMapController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/AreaMapController.java index a996ee4..84345f7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/AreaMapController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/AreaMapController.java @@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -48,7 +48,7 @@ public class AreaMapController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } @PostMapping("/update") @@ -58,7 +58,7 @@ public class AreaMapController extends BladeController { return R.status(service.updateById(entity)); } - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "区域地图配置", @@ -69,7 +69,7 @@ public class AreaMapController extends BladeController { return R.data(service.pageCondition(vo, query)); } - @ApiLog + @ApiOperation("获取百度地图编码") @GetMapping("/map") @ApiOperationSupport(order = 5) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/FocusAttributeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/FocusAttributeController.java index f44d635..b185da5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/FocusAttributeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/FocusAttributeController.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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 org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -48,7 +48,7 @@ public class FocusAttributeController extends BladeController { return R.status(attributeService.save(attributeEntity)); } - @ApiLog + @PostMapping("/getMainList") @ApiOperation("查询列表（主界面）") @ApiOperationSupport(order = 1) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java index 5f4e853..d8afb04 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.config.entity.StFocusPropertiesEntity; import com.hnac.hzims.operational.config.service.StFocusPropertiesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -30,7 +30,7 @@ public class StFocusPropertiesController { private StFocusPropertiesService stFocusPropertiesService; - @ApiLog + @ApiOperation("分页查询") @RequestMapping(value = "/pageList", method = RequestMethod.GET) @OperationAnnotation( diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/AreaMapService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/AreaMapService.java index edf1601..f73e3f0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/AreaMapService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/AreaMapService.java @@ -2,10 +2,11 @@ package com.hnac.hzims.operational.config.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.config.entity.AreaMapEntity; import com.hnac.hzims.operational.config.vo.AreaMapVo; import com.hnac.hzims.operational.main.vo.MapMarkerVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import java.util.List; /** * @author ysj */ -public interface AreaMapService extends BaseService { +public interface AreaMapService extends IService { IPage pageCondition(AreaMapVo vo, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/IFocusAttributeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/IFocusAttributeService.java index 25a29f0..6164fa0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/IFocusAttributeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/IFocusAttributeService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.operational.config.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.mp.support.Query; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.config.entity.FocusAttributeEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; /** * @author hx */ -public interface IFocusAttributeService extends BaseService { +public interface IFocusAttributeService extends IService { /** * 修改保存 * @param focusAttributeEntityList diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StAlamRecordService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StAlamRecordService.java index fca0f07..052d5c0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StAlamRecordService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StAlamRecordService.java @@ -2,11 +2,12 @@ package com.hnac.hzims.operational.config.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; import com.hnac.hzims.operational.config.vo.SoeBodyVo; import com.hnac.hzims.operational.config.vo.StAlarmRecordVo; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public interface StAlamRecordService extends BaseService { +public interface StAlamRecordService extends IService { /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StFocusPropertiesService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StFocusPropertiesService.java index b8eaa19..1352106 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StFocusPropertiesService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/StFocusPropertiesService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.operational.config.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.config.entity.StFocusPropertiesEntity; import com.hnac.hzims.operational.config.vo.StationRealVo; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface StFocusPropertiesService extends BaseService { +public interface StFocusPropertiesService extends IService { String getRealIds(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/AreaMapServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/AreaMapServiceImpl.java index 7bd56bc..c45b1b1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/AreaMapServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/AreaMapServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.main.vo.MapMarkerVo; import com.hnac.hzims.operational.station.entity.StationEntity; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.MapUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class AreaMapServiceImpl extends BaseServiceImpl implements AreaMapService { +public class AreaMapServiceImpl extends ServiceImpl implements AreaMapService { private final AreaService areaService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/FocusAttributeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/FocusAttributeServiceImpl.java index 890b1bb..ba93038 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/FocusAttributeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/FocusAttributeServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.operational.config.mapper.FocusAttributeMapper; import com.hnac.hzims.operational.config.service.IFocusAttributeService; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class FocusAttributeServiceImpl extends BaseServiceImpl implements IFocusAttributeService { +public class FocusAttributeServiceImpl extends ServiceImpl implements IFocusAttributeService { private final UserAuthDataService userAuthDataService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 0daee7e..123b781 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -39,7 +39,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.apache.poi.ss.usermodel.Workbook; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -61,7 +61,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class StAlamRecordServiceImpl extends BaseServiceImpl implements StAlamRecordService { +public class StAlamRecordServiceImpl extends ServiceImpl implements StAlamRecordService { private final HttpServletResponse httpServletResponse; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StFocusPropertiesServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StFocusPropertiesServiceImpl.java index 4c75b43..18fe535 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StFocusPropertiesServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StFocusPropertiesServiceImpl.java @@ -23,8 +23,8 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.MapUtils; -import org.springblade.core.log.logger.BladeLogger; -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.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor -public class StFocusPropertiesServiceImpl extends BaseServiceImpl implements StFocusPropertiesService { +public class StFocusPropertiesServiceImpl extends ServiceImpl implements StFocusPropertiesService { private final IStationService stationService; @@ -55,7 +55,7 @@ public class StFocusPropertiesServiceImpl extends BaseServiceImpl getStatisticByMonth(@Param("month") String month, @Param("createDept") List createDept); @@ -60,10 +61,10 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper selectDefectByEmCodeList(String emCode); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List getFaultByFaultCode(Map params); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List> getDefectConclusion(Map params); Boolean updateDefectInfo(OperDefectEntity entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java index b70e039..c1e7006 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.defect.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -83,7 +83,8 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper> getPhenomenonConclusion(Map params); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IDefectCheckService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IDefectCheckService.java index 3d73869..9df20ba 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IDefectCheckService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IDefectCheckService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.defect.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.vo.SolveHomeVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -13,7 +14,7 @@ import java.util.List; /** * @author ysj */ -public interface IDefectCheckService extends BaseService { +public interface IDefectCheckService extends IService { /** * 保存现象、开启缺陷流程 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperAppearanceService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperAppearanceService.java index 625dad3..e4594e1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperAppearanceService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperAppearanceService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.operational.defect.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.entity.OperAppearanceEntity; import com.hnac.hzims.operational.defect.vo.OperAppearanceVO; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface IOperAppearanceService extends BaseService { +public interface IOperAppearanceService extends IService { LambdaQueryWrapper getQueryWrapper(OperAppearanceVO operAppearanceVO); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java index 4456413..e826645 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java @@ -3,13 +3,14 @@ package com.hnac.hzims.operational.defect.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.vo.OperDefectVO; import com.hnac.hzims.operational.report.vo.DefectReportsVO; import com.hnac.hzims.operational.report.vo.DefectRunReportsVO; import com.hnac.hzims.vo.SafeCheckStatisticVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import org.springblade.flow.core.entity.BladeFlow; @@ -24,7 +25,7 @@ import java.util.Map; * * @author Chill */ -public interface IOperDefectService extends BaseService { +public interface IOperDefectService extends IService { /** * 开始问题处理流程 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectStatisticsService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectStatisticsService.java index 6b54a54..0bacb05 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectStatisticsService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectStatisticsService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.defect.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.dto.OperDefectStatisticsDTO; import com.hnac.hzims.operational.defect.entity.OperDefectStatisticsEntity; import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsExportVO; import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO; import com.hnac.hzims.operational.defect.vo.StatistictCountVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -15,7 +16,7 @@ import java.util.List; * * @author Chill */ -public interface IOperDefectStatisticsService extends BaseService { +public interface IOperDefectStatisticsService extends IService { /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperFaultService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperFaultService.java index 4a12e8b..94168d2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperFaultService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperFaultService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.operational.defect.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.defect.entity.OperFaultEntity; import com.hnac.hzims.operational.defect.vo.FaultVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.system.vo.CreateTableVO; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * * @author Chill */ -public interface IOperFaultService extends BaseService { +public interface IOperFaultService extends IService { List getFaulCreateTable(List tableNames); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperPhenomenonService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperPhenomenonService.java index 1f3bf57..becbf2c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperPhenomenonService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperPhenomenonService.java @@ -1,5 +1,6 @@ package com.hnac.hzims.operational.defect.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.fdp.entity.FdpTaskEntity; import com.hnac.hzims.operational.defect.dto.OperMainDefectDTO; import com.hnac.hzims.operational.defect.dto.OperPhenomenonDTO; @@ -7,7 +8,7 @@ import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.duty.vo.MainOperPhenomenonVo; import com.hnac.hzims.operational.report.vo.CheckVoteChartVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.flow.core.entity.BladeFlow; import java.util.List; @@ -18,7 +19,7 @@ import java.util.Map; * * @author Chill */ -public interface IOperPhenomenonService extends BaseService { +public interface IOperPhenomenonService extends IService { /** * 提交现象 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java index e101699..8e916a1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java @@ -29,7 +29,7 @@ import com.hnac.hzims.operational.util.TimeUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -69,7 +69,7 @@ import java.util.concurrent.TimeUnit; @Service @Slf4j @RequiredArgsConstructor -public class DefectCheckServiceImpl extends BaseServiceImpl implements IDefectCheckService { +public class DefectCheckServiceImpl extends ServiceImpl implements IDefectCheckService { private final IOperDefectService defectService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperAppearanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperAppearanceServiceImpl.java index b0ddfef..d1e097f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperAppearanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperAppearanceServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.operational.defect.entity.OperAppearanceEntity; import com.hnac.hzims.operational.defect.mapper.OperAppearanceMapper; import com.hnac.hzims.operational.defect.service.IOperAppearanceService; import com.hnac.hzims.operational.defect.vo.OperAppearanceVO; -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.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class OperAppearanceServiceImpl extends BaseServiceImpl implements IOperAppearanceService { +public class OperAppearanceServiceImpl extends ServiceImpl implements IOperAppearanceService { @Override public LambdaQueryWrapper getQueryWrapper(OperAppearanceVO operAppearanceVO) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java index c4d2a06..f74942e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java @@ -28,7 +28,7 @@ import com.hnac.hzims.safeproduct.Constants; import com.hnac.hzims.spare.entity.WtSpManagementEntity; import com.hnac.hzims.vo.SafeCheckStatisticVO; import lombok.AllArgsConstructor; -import net.logstash.logback.encoder.org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -82,7 +82,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class OperDefectServiceImpl extends BaseServiceImpl implements IOperDefectService { +public class OperDefectServiceImpl extends ServiceImpl implements IOperDefectService { private static final Logger logger = LoggerFactory.getLogger(OperDefectServiceImpl.class); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectStatisticsServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectStatisticsServiceImpl.java index 2ae72b0..254429a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectStatisticsServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectStatisticsServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.operational.defect.vo.StatistictCount; import com.hnac.hzims.operational.defect.vo.StatistictCountVo; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.feign.ITicketInfoClient; -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.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class OperDefectStatisticsServiceImpl extends BaseServiceImpl implements IOperDefectStatisticsService { +public class OperDefectStatisticsServiceImpl extends ServiceImpl implements IOperDefectStatisticsService { @Autowired diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperFaultServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperFaultServiceImpl.java index cfb29dc..fab16b3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperFaultServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperFaultServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.operational.defect.util.TableJsonUtils; import com.hnac.hzims.operational.defect.vo.FaultVO; import org.apache.commons.collections4.MapUtils; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.vo.CreateTableVO; @@ -28,7 +28,7 @@ import java.util.Map; * @author Chill */ @Service -public class OperFaultServiceImpl extends BaseServiceImpl implements IOperFaultService { +public class OperFaultServiceImpl extends ServiceImpl implements IOperFaultService { @Autowired private IOperPhenomenonService phenomenonService; @@ -80,7 +80,7 @@ public class OperFaultServiceImpl extends BaseServiceImpl ids) { for (Long id : ids) { OperFaultEntity fault = this.getById(id); @@ -92,7 +92,7 @@ public class OperFaultServiceImpl extends BaseServiceImpl implements IOperPhenomenonService,GenerateCode{ +public class OperPhenomenonServiceImpl extends ServiceImpl implements IOperPhenomenonService,GenerateCode{ @Autowired private ISysClient sysClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java index f94a86d..c5500e3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyChangeController.java @@ -132,7 +132,7 @@ public class ImsDutyChangeController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(imsDutyService.deleteLogic(Func.toLongList(ids))); + return R.status(imsDutyService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java index c4fc34f..5299a0e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java @@ -100,7 +100,7 @@ public class ImsDutyClassController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(imsDutyClassService.deleteLogic(Func.toLongList(ids))); + return R.status(imsDutyClassService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java index 5346977..89d094e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainTemplateController.java @@ -47,7 +47,7 @@ public class ImsDutyMainTemplateController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(iImsDutyMainTemplateService.deleteLogic(Func.toLongList(ids))); + return R.status(iImsDutyMainTemplateService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java index 166bad4..3a8a175 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java @@ -130,7 +130,7 @@ public class ImsDutyRecController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(imsDutyRecService.deleteLogic(Func.toLongList(ids))); + return R.status(imsDutyRecService.removeByIds(Func.toLongList(ids))); } @@ -316,7 +316,7 @@ public class ImsDutyRecController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "删除分析实例模板", notes = "传入analyseExample") public R deleteAnalyseExample(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(iImsAnalyseExampleService.deleteLogic(Func.toLongList(ids))); + return R.status(iImsAnalyseExampleService.removeByIds(Func.toLongList(ids))); } /** * 查询分析实例Id diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyRecClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyRecClient.java index fb01993..e4378bc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyRecClient.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/feign/DutyRecClient.java @@ -9,8 +9,9 @@ import com.hnac.hzims.operational.duty.dto.ImsDutyRecDTO; import com.hnac.hzims.operational.duty.service.IImsDutyRecService; import com.hnac.hzims.operational.duty.vo.ImsDutyRecVO; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; @@ -22,11 +23,10 @@ import org.springframework.web.bind.annotation.RestController; @RestController @AllArgsConstructor +@Slf4j public class DutyRecClient implements IDutyRecClient { private final IImsDutyRecService service; - private final BladeLogger logger; - @Override public R getChangeShifts(ChangeShiftsReqDTO reqDTO) { return R.data(service.getChangeShifts(reqDTO)); @@ -34,7 +34,7 @@ public class DutyRecClient implements IDutyRecClient { @Override public R dealDutyRecFlow(ProcessWorkFlowResponse processWorkFlowResponse) { - logger.info("operational:duty:rec:dealDutyRecFlow","接受到消息：消息内容为："+ JSON.toJSONString(processWorkFlowResponse)); + log.info("operational:duty:rec:dealDutyRecFlow","接受到消息：消息内容为："+ JSON.toJSONString(processWorkFlowResponse)); //ImsDutyRecDTO recDTO = BeanUtil.copy(processWorkFlowResponse.getVariables(),ImsDutyRecDTO.class); ImsDutyRecDTO recDTO = JSONObject.parseObject(JSON.toJSONString(processWorkFlowResponse.getVariables()),ImsDutyRecDTO.class); Assert.isTrue(ObjectUtil.isNotEmpty(recDTO),() -> { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.java index 6d452b1..fe767e5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.duty.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.operational.duty.entity.ImsDutyGroupPEntity; import com.hnac.hzims.operational.duty.vo.DutyMemberVO; @@ -42,7 +42,7 @@ public interface ImsDutyGroupPMapper extends BaseMapper { String selectPersonIdsByGroupId(Long groupId); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List getDutyMainStatisticsByClassId(Map params); List> getDutyConclusion(Map params); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java index 4797168..33347cf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java @@ -1,6 +1,7 @@ package com.hnac.hzims.operational.duty.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; + import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.*; import org.apache.ibatis.annotations.Param; @@ -74,6 +75,6 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper selectByDateListV2(@Param(value = "date")String date,@Param(value = "deptId") Long deptId); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List selectDutyMainByPerson(@Param(value = "date")String date,@Param(value = "userId") Long userId); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IDutyGroupGeneratingCapacityService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IDutyGroupGeneratingCapacityService.java index 6e7a748..8597b52 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IDutyGroupGeneratingCapacityService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IDutyGroupGeneratingCapacityService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.DutyGroupGeneratingCapacityEntity; import com.hnac.hzims.operational.duty.vo.GroupGenerationVo; import com.hnac.hzims.operational.duty.vo.StationDutyGroupGenerationVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; @@ -16,7 +17,7 @@ import java.util.List; * @author lx * @since 2022-02-24 */ -public interface IDutyGroupGeneratingCapacityService extends BaseService { +public interface IDutyGroupGeneratingCapacityService extends IService { /** * 获取班组发电量 --首页 生产 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsAnalyseExampleService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsAnalyseExampleService.java index a2c2cc6..501842e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsAnalyseExampleService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsAnalyseExampleService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.AnalyseExample; import com.hnac.hzinfo.datasearch.analyse.domain.AnalyzeDataCondition; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import org.springblade.core.mp.support.Query; @@ -13,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; * * @author Chill */ -public interface IImsAnalyseExampleService extends BaseService { +public interface IImsAnalyseExampleService extends IService { R queryAnalyseExampleData(AnalyzeDataCondition analyzeDataCondition); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyChangeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyChangeService.java index 472caeb..02027a3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyChangeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyChangeService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.duty.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyChangeEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyChangeTowVo; import com.hnac.hzims.operational.duty.vo.ImsDutyChangeVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.flow.core.entity.BladeFlow; /** @@ -12,7 +13,7 @@ import org.springblade.flow.core.entity.BladeFlow; * * @author Chill */ -public interface IImsDutyChangeService extends BaseService { +public interface IImsDutyChangeService extends IService { /** * 提交，开始工作流 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java index 9a502aa..c040ef1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.common.pojo.Tree; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyClassService extends BaseService { +public interface IImsDutyClassService extends IService { /** * 添加与修改 * @param imsDutyClass diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassTypeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassTypeService.java index 0295195..b5da3b1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassTypeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassTypeService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyClassTypeEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyClassTypeService extends BaseService { +public interface IImsDutyClassTypeService extends IService { R saveOrUpdateImsDutyClassType(ImsDutyClassTypeEntity imsDutyClassType); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyEmergencyService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyEmergencyService.java index c0aceaf..29d29b1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyEmergencyService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyEmergencyService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyEmergencyEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyEmergencyVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -12,7 +13,7 @@ import org.springblade.core.tool.api.R; * * @author Chill */ -public interface IImsDutyEmergencyService extends BaseService { +public interface IImsDutyEmergencyService extends IService { R saveEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyGroupService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyGroupService.java index 334435b..5431968 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyGroupService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyGroupService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.duty.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyGroupEntity; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.vo.DutyGroupMemberVo; import com.hnac.hzims.operational.duty.vo.ImsDutyGroupPersonVO; import com.hnac.hzims.operational.duty.vo.ImsDutyGroupVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +19,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyGroupService extends BaseService { +public interface IImsDutyGroupService extends IService { /** * 添加值班小组及小组成员 * @param imsDutyGroupVO diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyLogService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyLogService.java index 6213480..1564d36 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyLogService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyLogService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyLogEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.HashMap; /** @@ -9,7 +10,7 @@ import java.util.HashMap; * * @author Chill */ -public interface IImsDutyLogService extends BaseService { +public interface IImsDutyLogService extends IService { void exportDutyLog(String dutyId, HashMap map); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainPersonService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainPersonService.java index a00abe1..fef47ed 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainPersonService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainPersonService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyMainPersonEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyMainPersonService extends BaseService { +public interface IImsDutyMainPersonService extends IService { void doSaveBasch(List list); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainService.java index 014bede..8d19b82 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainService.java @@ -1,5 +1,6 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.entity.ImsDutyMainReportExcel; import com.hnac.hzims.operational.duty.entity.ImsDutyRecEntity; @@ -7,7 +8,7 @@ import com.hnac.hzims.operational.duty.vo.*; import com.hnac.hzims.operational.main.vo.DutyPersonalReportVO; import com.hnac.hzims.operational.report.vo.DutyReportVO; import com.hnac.hzims.operational.report.vo.DutyRunReportVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.time.LocalDate; @@ -19,7 +20,7 @@ import java.util.Map; * * @author Chill */ -public interface IImsDutyMainService extends BaseService { +public interface IImsDutyMainService extends IService { /** * 添加及修改值班信息 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainTemplateService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainTemplateService.java index 5db5ebc..41a8f44 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainTemplateService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainTemplateService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.operational.duty.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyMainTemplateEntity; import com.hnac.hzims.operational.duty.vo.ImsSchedulingVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -11,7 +12,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyMainTemplateService extends BaseService { +public interface IImsDutyMainTemplateService extends IService { List doListAll(ImsDutyMainTemplateEntity entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecQRRecordService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecQRRecordService.java index 4c364e3..7d797e2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecQRRecordService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecQRRecordService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.duty.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.entity.ImsDutyRecQRRecordEntity; import com.hnac.hzims.operational.main.vo.ImsDutyRecQRRecordVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; /** @@ -11,7 +12,7 @@ import org.springblade.core.tool.api.R; * * @author Chill */ -public interface IImsDutyRecQRRecordService extends BaseService { +public interface IImsDutyRecQRRecordService extends IService { /** * 自定义分页 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecService.java index 67e1e50..9818aac 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyRecService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.operational.duty.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.duty.dto.ChangeShiftsReqDTO; import com.hnac.hzims.operational.duty.dto.ChangeShiftsRspDTO; import com.hnac.hzims.operational.duty.dto.ImsDutyRecDTO; @@ -11,7 +12,7 @@ import com.hnac.hzims.operational.duty.entity.ImsDutyRecEntity; import com.hnac.hzims.operational.duty.vo.ImsDutyRecVO; import com.hnac.hzims.operational.duty.vo.ImsRecVo; import com.hnac.hzinfo.inspect.plan.vo.PlanVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import org.springblade.flow.core.entity.BladeFlow; @@ -22,7 +23,7 @@ import java.util.List; * * @author Chill */ -public interface IImsDutyRecService extends BaseService { +public interface IImsDutyRecService extends IService { R submit(ImsDutyRecEntity imsDutyRecEntity, PlanVO vo); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/DutyGroupGeneratingCapacityServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/DutyGroupGeneratingCapacityServiceImpl.java index 43c3e6d..6bfaa4e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/DutyGroupGeneratingCapacityServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/DutyGroupGeneratingCapacityServiceImpl.java @@ -18,7 +18,7 @@ import com.hnac.hzims.operational.station.service.IImsDeptService; import com.hnac.hzims.operational.station.service.IStationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class DutyGroupGeneratingCapacityServiceImpl extends BaseServiceImpl implements IDutyGroupGeneratingCapacityService { +public class DutyGroupGeneratingCapacityServiceImpl extends ServiceImpl implements IDutyGroupGeneratingCapacityService { private final IImsDutyGroupService imsDutyGroupService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java index 0a90259..dffc84e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java @@ -1,13 +1,14 @@ package com.hnac.hzims.operational.duty.service.impl; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.converters.longconverter.LongStringConverter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.duty.entity.AnalyseExample; import com.hnac.hzims.operational.duty.mapper.ImsAnalyseExampleMapper; import com.hnac.hzims.operational.duty.service.IImsAnalyseExampleService; @@ -22,10 +23,9 @@ import com.hnac.hzinfo.sdk.core.response.Result; import com.hnac.hzinfo.sdk.v5.analyse.AnalyseDataHandlerClient; import com.hnac.hzinfo.sdk.v5.analyse.vo.AnalseInstanceVO; import lombok.extern.slf4j.Slf4j; -import net.logstash.logback.encoder.org.apache.commons.lang3.ObjectUtils; -import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.ObjectUtils; 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.Query; import org.springblade.core.tool.api.R; @@ -48,7 +48,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class ImsAnalyseExampleServiceImpl extends BaseServiceImpl implements IImsAnalyseExampleService { +public class ImsAnalyseExampleServiceImpl extends ServiceImpl implements IImsAnalyseExampleService { @Autowired private IAnalyseDataSearchClient searchClient; @Autowired @@ -193,7 +193,7 @@ public class ImsAnalyseExampleServiceImpl extends BaseServiceImpl implements IImsDutyChangeService { +public class ImsDutyChangeServiceImpl extends ServiceImpl implements IImsDutyChangeService { private final IUserClient userClient; private final IFlowClient flowClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java index 4f6e03f..855a676 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.duty.mapper.ImsDutyMainMapper; import com.hnac.hzims.operational.duty.service.IImsDutyClassService; import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; import org.apache.commons.lang3.StringUtils; -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.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class ImsDutyClassServiceImpl extends BaseServiceImpl implements IImsDutyClassService { +public class ImsDutyClassServiceImpl extends ServiceImpl implements IImsDutyClassService { @Autowired private ImsDutyMainMapper imsDutyMainMapper; @@ -76,7 +76,7 @@ public class ImsDutyClassServiceImpl extends BaseServiceImpl id = res.stream().map(s -> s.getId()).collect(Collectors.toList()); - this.deleteLogic(id); + this.removeByIds(id); } return R.status(this.saveOrUpdateBatch(imsDutyClass)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassTypeServiceImpl.java index 1083065..65b35d0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassTypeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassTypeServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.duty.mapper.ImsDutyClassTypeMapper; import com.hnac.hzims.operational.duty.service.IImsDutyClassTypeService; import com.hnac.hzims.operational.duty.vo.ImsDutyClassVO; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class ImsDutyClassTypeServiceImpl extends BaseServiceImpl implements IImsDutyClassTypeService { +public class ImsDutyClassTypeServiceImpl extends ServiceImpl implements IImsDutyClassTypeService { @Autowired private ImsDutyClassMapper classMapper; @@ -96,7 +96,7 @@ public class ImsDutyClassTypeServiceImpl extends BaseServiceImpl 0) { return R.fail("所选列表存在绑定班次选项,不可删除!"); } - return R.status(this.deleteLogic(list)); + return R.status(this.removeByIds(list)); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java index 250304b..b92185e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; import com.hnac.hzims.operational.duty.entity.ImsDutyEmergencyEntity; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; @@ -15,10 +16,9 @@ import com.hnac.hzims.operational.duty.vo.ImsDutyEmergencyVo; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.sdk.v5.analyse.AnalyseDataHandlerClient; import lombok.extern.slf4j.Slf4j; -import net.logstash.logback.encoder.org.apache.commons.lang3.ObjectUtils; -import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils; import org.apache.commons.collections4.CollectionUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.ObjectUtils; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl implements IImsDutyEmergencyService { +public class ImsDutyEmergencyServiceImpl extends ServiceImpl implements IImsDutyEmergencyService { @Resource private ImsDutyMainMapper imsDutyMainMapper; @Autowired @@ -80,7 +80,7 @@ public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl { R user = userClient.userInfoById(sig.getRegistrant()); - if (user.isSuccess()&&ObjectUtils.isNotEmpty(user.getData())){ + if (user.isSuccess()&& ObjectUtils.isNotEmpty(user.getData())){ sig.setRegistrantName(user.getData().getRealName()); } R userR = userClient.userInfoById(sig.getChargePerson()); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java index 08477e3..2d6bd1b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.duty.service.IImsDutyGroupService; import com.hnac.hzims.operational.duty.service.IImsDutyMainService; import com.hnac.hzims.operational.duty.vo.*; import org.apache.commons.lang3.StringUtils; -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.Query; import org.springblade.core.secure.BladeUser; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class ImsDutyGroupServiceImpl extends BaseServiceImpl implements IImsDutyGroupService { +public class ImsDutyGroupServiceImpl extends ServiceImpl implements IImsDutyGroupService { @Autowired private IImsDutyMainService iImsDutyMainService; @@ -294,7 +294,7 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl implements IImsDutyLogService { +public class ImsDutyLogServiceImpl extends ServiceImpl implements IImsDutyLogService { @Value("${hzims.duty.file-path}") private String savePath; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainPersonServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainPersonServiceImpl.java index 525f119..ecfe85e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainPersonServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainPersonServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.duty.service.IImsDutyMainPersonService; import com.hnac.hzims.operational.duty.service.IImsDutyMainTemplateService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.List; */ @Service @Slf4j -public class ImsDutyMainPersonServiceImpl extends BaseServiceImpl implements IImsDutyMainPersonService { +public class ImsDutyMainPersonServiceImpl extends ServiceImpl implements IImsDutyMainPersonService { @Autowired private ImsDutyGroupPMapper imsDutyGroupPMapper; @Autowired diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java index 4d0aba5..96dfaed 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java @@ -23,7 +23,7 @@ import com.hnac.hzims.operational.report.vo.DutyRunReportVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -56,7 +56,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class ImsDutyMainServiceImpl extends BaseServiceImpl implements IImsDutyMainService { +public class ImsDutyMainServiceImpl extends ServiceImpl implements IImsDutyMainService { @Resource private ImsDutyGroupPMapper imsDutyGroupPMapper; @Autowired @@ -123,7 +123,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl collect = personEntityList.stream().map(s -> s.getId()).collect(Collectors.toList()); - return R.status(this.deleteLogic(ids) && iImsDutyMainPersonService.deleteLogic(collect)); + return R.status(this.removeByIds(ids) && iImsDutyMainPersonService.removeByIds(collect)); } @Override @@ -1536,7 +1536,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl updateDutyMainIds = updateDutyMainEntities.stream().map(s -> s.getId()).collect(Collectors.toList()); this.baseMapper.deleteByUserId(updateDutyMainIds); this.saveBatch(updateDutyMainEntities); - iImsDutyMainPersonService.deleteLogic(list); + iImsDutyMainPersonService.removeByIds(list); iImsDutyMainPersonService.saveBatch(updatePersonEntityList); return R.success("修改成功"); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainTemplateImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainTemplateImpl.java index bacbf05..b578d1f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainTemplateImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainTemplateImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.duty.service.IImsDutyMainTemplateService; import com.hnac.hzims.operational.duty.vo.FlexibleSchedulingVo; import com.hnac.hzims.operational.duty.vo.ImsSchedulingVo; 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.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import java.util.List; @Service @Slf4j -public class ImsDutyMainTemplateImpl extends BaseServiceImpl implements IImsDutyMainTemplateService { +public class ImsDutyMainTemplateImpl extends ServiceImpl implements IImsDutyMainTemplateService { @Override public List doListAll(ImsDutyMainTemplateEntity entity) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java index e1b8154..4efae5e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecQRRecordServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.duty.service.IImsDutyMainService; import com.hnac.hzims.operational.duty.service.IImsDutyRecQRRecordService; import com.hnac.hzims.operational.main.vo.ImsDutyRecQRRecordVo; import lombok.AllArgsConstructor; -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.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -26,7 +26,7 @@ import java.util.List; */ @Service @AllArgsConstructor -public class ImsDutyRecQRRecordServiceImpl extends BaseServiceImpl implements IImsDutyRecQRRecordService { +public class ImsDutyRecQRRecordServiceImpl extends ServiceImpl implements IImsDutyRecQRRecordService { private final IUserClient userClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java index bad0c0d..e83a5c9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java @@ -45,7 +45,7 @@ import com.hnac.hzinfo.inspect.plan.feign.IInspectPlanClient; import com.hnac.hzinfo.inspect.plan.vo.PlanVO; import lombok.extern.slf4j.Slf4j; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; @@ -85,7 +85,7 @@ import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATETIME; */ @Slf4j @Service -public class ImsDutyRecServiceImpl extends BaseServiceImpl implements IImsDutyRecService { +public class ImsDutyRecServiceImpl extends ServiceImpl implements IImsDutyRecService { @Resource private ITicketInfoClient ticketInfoClient; @Autowired diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/utils/ExcelMergeHandler.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/utils/ExcelMergeHandler.java index 8bcc9ce..87858fb 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/utils/ExcelMergeHandler.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/utils/ExcelMergeHandler.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.duty.utils; -import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.CellData; +import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; @@ -45,13 +46,13 @@ public class ExcelMergeHandler implements CellWriteHandler { } - @Override + public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { } @Override - public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { //当前行 int curRowIndex = cell.getRowIndex(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java index f18a640..62e68a0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -117,7 +117,7 @@ public class EcologyController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R station_remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(stationService.deleteLogic(Func.toLongList(ids))); + return R.status(stationService.removeByIds(Func.toLongList(ids))); } @@ -127,7 +127,7 @@ public class EcologyController extends BladeController { * @param query * @return */ - @ApiLog + @GetMapping("/station/list") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "EcologyFlowStationEntity") @@ -141,7 +141,7 @@ public class EcologyController extends BladeController { * @param entity * @return */ - @ApiLog + @RequestMapping(value = "/station/detail", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 4) @ApiOperation(value = "详情", notes = "EcologyFlowStationEntity") @@ -175,7 +175,7 @@ public class EcologyController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R data_remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(dataService.deleteLogic(Func.toLongList(ids))); + return R.status(dataService.removeByIds(Func.toLongList(ids))); } @@ -185,7 +185,7 @@ public class EcologyController extends BladeController { * @param query * @return */ - @ApiLog + @GetMapping("/data/list") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "EcologyFlowdataEntity") @@ -199,7 +199,7 @@ public class EcologyController extends BladeController { * @param entity * @return */ - @ApiLog + @RequestMapping(value = "/data/detail", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 4) @ApiOperation(value = "详情", notes = "EcologyFlowdataEntity") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/QdnHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/QdnHomeController.java index 3a41efc..b246644 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/QdnHomeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/QdnHomeController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,7 +35,7 @@ public class QdnHomeController extends BladeController { private final HydropowerService hydropowerService; - @ApiLog + @ApiOperation("首页站点数量") @GetMapping("/count") @ApiOperationSupport(order = 1) @@ -43,7 +43,7 @@ public class QdnHomeController extends BladeController { return R.data(homeService.count(false)); } - @ApiLog + @ApiOperation("水电站集团/区域指标") @GetMapping("/KPIs") @ApiOperationSupport(order = 1) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowDataService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowDataService.java index 407fcfb..9a74900 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowDataService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowDataService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.operational.ecology.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.ecology.entity.EcologyFlowDataEntity; import com.hnac.hzims.operational.ecology.vo.TrendChartVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface EcologyFlowDataService extends BaseService { +public interface EcologyFlowDataService extends IService { } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowMapService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowMapService.java index ee7e183..623c98b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowMapService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowMapService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.ecology.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.ecology.entity.EcologyFlowMapEntity; -import org.springblade.core.mp.base.BaseService; + /** * 生态流量地图接口 * @author ysj */ -public interface EcologyFlowMapService extends BaseService { +public interface EcologyFlowMapService extends IService { EcologyFlowMapEntity map(); } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java index fffa690..97db615 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java @@ -1,17 +1,18 @@ package com.hnac.hzims.operational.ecology.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.ecology.entity.EcologyFlowStationEntity; import com.hnac.hzims.operational.ecology.vo.EcologFlowStationVo; import com.hnac.hzims.operational.ecology.vo.StationVo; import com.hnac.hzims.operational.ecology.vo.TrendChartVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface EcologyFlowStationService extends BaseService { +public interface EcologyFlowStationService extends IService { EcologFlowStationVo station_top(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowDataServiceImpl.java index 5a26bf4..ee58e74 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowDataServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.ecology.service.EcologyFlowStationService; import com.hnac.hzims.operational.ecology.vo.TrendChartVo; import lombok.RequiredArgsConstructor; 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.DateUtil; import org.springframework.stereotype.Service; @@ -24,6 +24,6 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class EcologyFlowDataServiceImpl extends BaseServiceImpl implements EcologyFlowDataService { +public class EcologyFlowDataServiceImpl extends ServiceImpl implements EcologyFlowDataService { } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowMapServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowMapServiceImpl.java index 9e06806..3aa058a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowMapServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowMapServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.ecology.mapper.EcologyFlowMapMapper; import com.hnac.hzims.operational.ecology.service.EcologyFlowMapService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -19,7 +19,7 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class EcologyFlowMapServiceImpl extends BaseServiceImpl implements EcologyFlowMapService { +public class EcologyFlowMapServiceImpl extends ServiceImpl implements EcologyFlowMapService { /** * 获取地图 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java index 56d7836..52f2c7f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java @@ -24,7 +24,7 @@ import com.hnac.hzims.operational.station.service.IStationService; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; import lombok.RequiredArgsConstructor; 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.DateUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class EcologyFlowStationServiceImpl extends BaseServiceImpl implements EcologyFlowStationService { +public class EcologyFlowStationServiceImpl extends ServiceImpl implements EcologyFlowStationService { private final IStationService stationService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java index d5afdfd..c4d4979 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java @@ -53,7 +53,7 @@ public class UserFeedbackController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "删除反馈信息", notes = "传入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))); } @PostMapping("/reply") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java index 75b854d..8790546 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.operational.feedback.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; import com.hnac.hzims.operational.feedback.vo.FeedbackQueryVo; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface IUserFeedbackService extends BaseService { +public interface IUserFeedbackService extends IService { IPage pageCondition(FeedbackQueryVo query,IPage page); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java index 8424ddd..72d7ab1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.operational.feedback.vo.FeedbackQueryVo; import com.hnac.hzims.operational.station.entity.StationEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class UserFeedbackServiceImpl extends BaseServiceImpl implements IUserFeedbackService { +public class UserFeedbackServiceImpl extends ServiceImpl implements IUserFeedbackService { private final IUserClient userClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feign/OperTaskClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feign/OperTaskClient.java index 377c87d..ff02ae3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feign/OperTaskClient.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feign/OperTaskClient.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskServic import com.hnac.hzims.vo.SafeCheckStatisticVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +28,6 @@ public class OperTaskClient implements IOperTaskClient { private final IOperMaintenanceTaskService maintenanceTaskService; private final IOperAccessTaskService accessTaskService; private final IOperDefectService operDefectService; - private final BladeLogger bladeLogger; @Override @GetMapping(GET_OPERATIONAL_TASK) @@ -43,7 +42,7 @@ public class OperTaskClient implements IOperTaskClient { vo = maintenanceTaskService.getMaintenanceTaskCheck(startDate,endDate,dept); } catch(Exception e) { - bladeLogger.error("TaskClient---getMaintenanceTaskCheck",e.getMessage()); + log.error("TaskClient---getMaintenanceTaskCheck",e.getMessage()); e.printStackTrace(); } return vo; @@ -56,7 +55,7 @@ public class OperTaskClient implements IOperTaskClient { vo = accessTaskService.getAccessTaskCheck(startDate,endDate,dept); } catch(Exception e) { - bladeLogger.error("TaskClient---getAccessTaskCheck",e.getMessage()); + log.error("TaskClient---getAccessTaskCheck",e.getMessage()); e.printStackTrace(); } return vo; @@ -70,7 +69,7 @@ public class OperTaskClient implements IOperTaskClient { defectList.add(operDefectService.getDefectCheck(startDate,endDate,dept,"2")); } catch (Exception e) { - bladeLogger.error("TaskClient---getDefectCheck",e.getMessage()); + log.error("TaskClient---getDefectCheck",e.getMessage()); e.printStackTrace(); } return defectList; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java index abe2ff8..a957527 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -63,13 +63,13 @@ public class GenerateController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java index 5721744..cc7701c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -47,7 +47,7 @@ public class OtherController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** @@ -63,7 +63,7 @@ public class OtherController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java index 3ea2d87..fbca5a6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -66,7 +66,7 @@ public class OverConfigController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", @@ -80,7 +80,7 @@ public class OverConfigController extends BladeController { /** * 获取排序号 // */ - @ApiLog + @PostMapping("/getSort") @ApiOperationSupport(order = 5) @ApiOperation(value = "获取排序号") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java index 242aaba..eaa6ca8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -64,7 +64,7 @@ public class OverController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java index 0f136e8..39ec3c9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverDetailsController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; @@ -30,7 +30,7 @@ public class OverDetailsController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @ApiOperation(value = "分页", notes = "查询条件：over_id") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java index 0aa7d48..b1b25ba 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -47,7 +47,7 @@ public class PowerController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** @@ -63,7 +63,7 @@ public class PowerController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java index f46dac8..df9f9ee 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java @@ -5,7 +5,7 @@ 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.operational.fill.vo.RainfallVo; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.operational.fill.entity.RainfallEntity; @@ -65,13 +65,13 @@ public class RainfallController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java index fcca32e..2dc246d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -50,7 +50,7 @@ public class SolveController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** @@ -66,7 +66,7 @@ public class SolveController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java index 1996c72..0210c5e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -49,13 +49,13 @@ public class StorageController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java index 5a99470..370979c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -62,13 +62,13 @@ public class UseController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/WindController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/WindController.java index 5a9d930..0bc8102 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/WindController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/WindController.java @@ -14,7 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -49,13 +49,13 @@ public class WindController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") 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))); } /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 4) @OperationAnnotation(moduleName = "数据填报", diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/GenerateService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/GenerateService.java index 699bd03..4a0e71b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/GenerateService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/GenerateService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.GenerateEntity; import com.hnac.hzims.operational.fill.vo.GenerateVo; import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.main.vo.GenerationPowerVo; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.List; * @date 2023/04/10 11:16:07 * @version 4.0.0 */ -public interface GenerateService extends BaseService { +public interface GenerateService extends IService { // 分页查询发电量填报数据 R> pageCondition(QueryVo filter, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OtherService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OtherService.java index 113ac59..bca9c22 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OtherService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OtherService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OtherEntity; import com.hnac.hzims.operational.fill.vo.OtherVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; /** * 其他填报接口 */ -public interface OtherService extends BaseService { +public interface OtherService extends IService { R> pageCondition(OtherVo vo, Query query); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverConfigService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverConfigService.java index 1501f72..51af944 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverConfigService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverConfigService.java @@ -2,9 +2,10 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OverConfigEntity; import com.hnac.hzims.operational.fill.vo.OverConfigVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,7 +14,7 @@ import java.util.List; /** * 检修配置接口 */ -public interface OverConfigService extends BaseService { +public interface OverConfigService extends IService { R> pageCondition(OverConfigVo vo, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverDetailsService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverDetailsService.java index 8caa164..65a357d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverDetailsService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverDetailsService.java @@ -2,9 +2,10 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.OverDetailsEntity; import com.hnac.hzims.operational.fill.vo.OverDetailsVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,7 +14,7 @@ import java.util.List; /** * 检修配置详情接口 */ -public interface OverDetailsService extends BaseService { +public interface OverDetailsService extends IService { R> pageCondition(OverDetailsVo vo, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverService.java index 260944f..16591c6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/OverService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.dto.OverReqDTO; import com.hnac.hzims.operational.fill.vo.OverVo; import com.hnac.hzims.operational.fill.entity.OverEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,7 +14,7 @@ import java.util.List; /** * 检修填报接口 */ -public interface OverService extends BaseService { +public interface OverService extends IService { boolean add(OverReqDTO dto); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/PowerService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/PowerService.java index 6ff6d55..6c7c637 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/PowerService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/PowerService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.PowerEntity; import com.hnac.hzims.operational.fill.vo.PowerVo; import com.hnac.hzims.operational.main.vo.GenerationPowerVo; import com.hnac.hzims.operational.main.vo.PowerMonthVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +15,7 @@ import java.util.List; /** * 其他填报接口 */ -public interface PowerService extends BaseService { +public interface PowerService extends IService { R add(PowerEntity entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java index 007ef5e..335968e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.RainfallEntity; import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.RainfallVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -15,7 +16,7 @@ import java.util.List; * 接入电站历史发电量填报 * @author ysj */ -public interface RainfallService extends BaseService { +public interface RainfallService extends IService { // 分页查询水利降雨量填报数据 R> pageCondition(QueryVo filter, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/SolveService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/SolveService.java index 86141fd..36714ed 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/SolveService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/SolveService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.SolveEntity; import com.hnac.hzims.operational.fill.vo.SolveVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; /** * 消缺填报接口 */ -public interface SolveService extends BaseService { +public interface SolveService extends IService { R> pageCondition(SolveVo vo, Query query); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/StorageService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/StorageService.java index a0961a5..5d8ede9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/StorageService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/StorageService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.StorageEntity; import com.hnac.hzims.operational.fill.vo.QueryVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -16,7 +17,7 @@ import org.springblade.core.tool.api.R; /** * 接入电站历史发电量填报 */ -public interface StorageService extends BaseService { +public interface StorageService extends IService { // 分页查询储能发电填报数据 R> pageCondition(QueryVo vo, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java index 91632f6..37dd678 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.UseEntity; import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.UseVo; import com.hnac.hzims.operational.main.vo.UsrPowerVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.Map; * @date 2023/04/10 11:16:07 * @version 4.0.0 */ -public interface UseService extends BaseService { +public interface UseService extends IService { // 分页查询用电量填报数据 R> pageCondition(QueryVo filter, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/WindService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/WindService.java index 7beb3ac..491835e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/WindService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/WindService.java @@ -1,19 +1,20 @@ package com.hnac.hzims.operational.fill.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.fill.entity.GenerateEntity; import com.hnac.hzims.operational.fill.entity.WindEntity; import com.hnac.hzims.operational.fill.vo.GenerateVo; import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.WindVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; /** * @author ysj */ -public interface WindService extends BaseService { +public interface WindService extends IService { // 分页查询发电量填报数据 R> pageCondition(QueryVo filter, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java index 2e170cd..ae353d2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java @@ -15,7 +15,7 @@ import com.hnac.hzims.operational.main.vo.PowerMonthVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class GenerateServiceImpl extends BaseServiceImpl implements GenerateService { +public class GenerateServiceImpl extends ServiceImpl implements GenerateService { /** * 分页查询发电量填报数据 @@ -106,7 +106,7 @@ public class GenerateServiceImpl extends BaseServiceImpl implements OtherService { +public class OtherServiceImpl extends ServiceImpl implements OtherService { @Override diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverConfigServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverConfigServiceImpl.java index 3b89e27..90061d8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverConfigServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverConfigServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.fill.vo.OverConfigVo; import com.hnac.hzims.operational.fill.wrapper.OverConfigWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.api.R; @@ -22,7 +22,7 @@ import java.util.Optional; @Slf4j @Service @AllArgsConstructor -public class OverConfigServiceImpl extends BaseServiceImpl implements OverConfigService { +public class OverConfigServiceImpl extends ServiceImpl implements OverConfigService { /** @@ -69,7 +69,7 @@ public class OverConfigServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper() {{ eq("over_name",overName); }}; - int count = this.baseMapper.selectCount(queryWrapper); + Long count = this.baseMapper.selectCount(queryWrapper); return count <= 0; } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverDetailsServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverDetailsServiceImpl.java index a7887b2..3cff480 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverDetailsServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/OverDetailsServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.fill.wrapper.OverDetailsWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -27,7 +27,7 @@ import java.util.Optional; @Slf4j @Service @AllArgsConstructor -public class OverDetailsServiceImpl extends BaseServiceImpl implements OverDetailsService { +public class OverDetailsServiceImpl extends ServiceImpl implements OverDetailsService { private OverConfigService configService; @@ -68,7 +68,7 @@ public class OverDetailsServiceImpl extends BaseServiceImpl implements OverService { +public class OverServiceImpl extends ServiceImpl implements OverService { @NotNull private final OverDetailsService detailsService; @@ -64,7 +64,7 @@ public class OverServiceImpl extends BaseServiceImpl imp */ @Override public boolean del(List list) { - boolean result = this.deleteLogic(list); + boolean result = this.removeByIds(list); if(!result){ return false; } @@ -110,7 +110,7 @@ public class OverServiceImpl extends BaseServiceImpl imp // 新增/修改 return detailsService.saveOrUpdateBatch(details); } - detailsService.deleteLogic(delList); + detailsService.removeByIds(delList); // 新增/修改 return detailsService.saveOrUpdateBatch(details); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/PowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/PowerServiceImpl.java index eb6a697..99ee73a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/PowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/PowerServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.main.vo.GenerationPowerVo; import com.hnac.hzims.operational.main.vo.PowerMonthVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class PowerServiceImpl extends BaseServiceImpl implements PowerService { +public class PowerServiceImpl extends ServiceImpl implements PowerService { private IUserClient userClient; @@ -80,7 +80,7 @@ public class PowerServiceImpl extends BaseServiceImpl ne("id",entity.getId()); } }}; - return this.baseMapper.selectCount(queryWrapper); + return this.baseMapper.selectCount(queryWrapper).intValue(); } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java index e50c1e9..04ca7a4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.fill.wrapper.RainfallWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class RainFallServiceImpl extends BaseServiceImpl implements RainfallService { +public class RainFallServiceImpl extends ServiceImpl implements RainfallService { /** @@ -96,7 +96,7 @@ public class RainFallServiceImpl extends BaseServiceImpl implements SolveService { +public class SolveServiceImpl extends ServiceImpl implements SolveService { @Override diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/StorageServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/StorageServiceImpl.java index 737aaae..f7840c0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/StorageServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/StorageServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.operational.fill.wrapper.StorageWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -31,7 +31,7 @@ import java.util.List; @Slf4j @Service @AllArgsConstructor -public class StorageServiceImpl extends BaseServiceImpl implements StorageService { +public class StorageServiceImpl extends ServiceImpl implements StorageService { private final SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.PATTERN_DATE); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java index fc00b17..334136a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.operational.main.vo.UsrPowerVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class UseServiceImpl extends BaseServiceImpl implements UseService { +public class UseServiceImpl extends ServiceImpl implements UseService { /** * 分页查询用电量填报数据 @@ -79,7 +79,7 @@ public class UseServiceImpl extends BaseServiceImpl implem // 如果存在就进行删除原来的填报数据 if(CollectionUtil.isNotEmpty(filleds)){ - this.deleteLogic(filleds.stream().map(UseEntity::getId).collect(Collectors.toList())); + this.removeByIds(filleds.stream().map(UseEntity::getId).collect(Collectors.toList())); } // 批量保存填报数据 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/WindServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/WindServiceImpl.java index 5dc4cb9..5b9d4a7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/WindServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/WindServiceImpl.java @@ -22,7 +22,7 @@ import com.hnac.hzims.operational.station.service.IStationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -45,7 +45,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class WindServiceImpl extends BaseServiceImpl implements WindService { +public class WindServiceImpl extends ServiceImpl implements WindService { private final IStationService stationService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AiAlarmController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AiAlarmController.java index acabaeb..5311bb8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AiAlarmController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AiAlarmController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -28,7 +28,7 @@ public class AiAlarmController extends BladeController { private final AiAlarmService aiAlarmService; - @ApiLog + @GetMapping("/video/alarm_page") @ApiOperationSupport(order = 15) @ApiOperation(value = "视频告警数据查询接口", notes = "station") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java index 57d6628..b594b55 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java @@ -16,7 +16,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.xwpf.usermodel.XWPFDocument; 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.tool.api.R; import org.springblade.core.tool.utils.DateUtil; @@ -50,7 +50,7 @@ public class AreaMonthReportController extends BladeController { private final IAreaMonthReportService service; @NotNull private final ISysClient sysClient; - @ApiLog + @ApiOperationSupport(order = 1) @ApiOperation("生成区域月报") @GetMapping("/loadMonthReport") @@ -58,7 +58,7 @@ public class AreaMonthReportController extends BladeController { service.loadMonthReport(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"), 1); return R.success("success"); } - @ApiLog + @ApiOperationSupport(order = 1) @ApiOperation("生成区域月报") @GetMapping("/loadMonthReportByType") @@ -66,7 +66,7 @@ public class AreaMonthReportController extends BladeController { service.loadMonthReportByType(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"), 1,type); return R.success("success"); } - @ApiLog + @ApiOperationSupport(order = 2) @ApiOperation("获取区域月报") @GetMapping("/getAreaMonthReport") @@ -77,7 +77,7 @@ public class AreaMonthReportController extends BladeController { public R> getAreaMonthReport(@ApiParam(value = "日期-年月", required = true) String date) { return service.getReport(date); } - @ApiLog + @ApiOperationSupport(order = 2) @ApiOperation("获取区域月报") @GetMapping("/getAreaMonthReportByType") @@ -91,7 +91,7 @@ public class AreaMonthReportController extends BladeController { } return service.getReportByType(date,type); } - @ApiLog + @ApiOperationSupport(order = 3) @ApiOperation("导出区域月报") @GetMapping("/exportAreaMonthReportByType") @@ -101,7 +101,7 @@ public class AreaMonthReportController extends BladeController { } return service.exportByType(response, date,type); } - @ApiLog + @ApiOperationSupport(order = 3) @ApiOperation("导出区域月报") @GetMapping("/exportAreaMonthReport") @@ -109,7 +109,7 @@ public class AreaMonthReportController extends BladeController { return service.export(response, date); } - @ApiLog + @ApiOperationSupport(order = 3) @ApiOperation("测试导出模板相关数据") @GetMapping("/exportAreaMonthReport3333") @@ -154,7 +154,7 @@ public class AreaMonthReportController extends BladeController { WordUtils.exportWord("template/demo2.docx", "F:/", "生成文件.docx", map); return R.success("测试成功"); } - @ApiLog + @ApiOperationSupport(order = 3) @ApiOperation("导出水电站月报") @GetMapping("/exportHydropowerStationMonthReport") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java index 5e02586..fd1ebbc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/FlawPhenomenonController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,7 +26,7 @@ public class FlawPhenomenonController extends BladeController { /** * 获取设备缺陷统计数据 */ - @ApiLog + @GetMapping("/getTheDayFlawCount") @ApiOperationSupport(order = 3) @ApiOperation(value = "获取当天缺陷统计", notes = "传入date") @@ -38,7 +38,7 @@ public class FlawPhenomenonController extends BladeController { /** * 获取设备缺陷统计数据 */ - @ApiLog + @GetMapping("/getTheDayDefectCount") @ApiOperationSupport(order = 4) @ApiOperation(value = "获取当天缺陷统计-首页(改)", notes = "传入date") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomeController.java index ec8b91f..3a0bd7e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomeController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +28,7 @@ public class HomeController extends BladeController { private final HomeService service; - @ApiLog + @ApiOperation("首页站点数量") @GetMapping("/count") @ApiOperationSupport(order = 1) @@ -36,7 +36,7 @@ public class HomeController extends BladeController { return R.data(service.count(true)); } - @ApiLog + @ApiOperation("首页关键指标") @GetMapping("/target") @ApiOperationSupport(order = 2) @@ -44,7 +44,7 @@ public class HomeController extends BladeController { return R.data(service.target(type)); } - @ApiLog + @ApiOperation("黔东南指标") @GetMapping("/blackTarget") @ApiOperationSupport(order = 2) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java index cb3b093..43bf82e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +28,7 @@ public class HydropowerController extends BladeController { private final HydropowerService service; - @ApiLog + @ApiOperation("水电站集团/区域指标") @GetMapping("/KPIs") @ApiOperationSupport(order = 1) @@ -36,7 +36,7 @@ public class HydropowerController extends BladeController { return R.data(service.KPIs(deptId,true)); } - @ApiLog + @ApiOperation("水电站集团/区域占比") @GetMapping("/proportion") @ApiOperationSupport(order = 2) @@ -45,7 +45,7 @@ public class HydropowerController extends BladeController { } - @ApiLog + @ApiOperation("水电站站点指标") @GetMapping("/station") @ApiOperationSupport(order = 3) @@ -53,7 +53,7 @@ public class HydropowerController extends BladeController { return R.data(service.station(deptId)); } - @ApiLog + @ApiOperation("水电站机组列表") @GetMapping("/getPumpList") @ApiOperationSupport(order = 4) @@ -61,7 +61,7 @@ public class HydropowerController extends BladeController { return R.data(service.hydropowerDevice(deptId)); } - @ApiLog + @ApiOperation("水电站站点列表") @GetMapping("/webStationList") @ApiOperationSupport(order = 5) @@ -70,7 +70,7 @@ public class HydropowerController extends BladeController { } - @ApiLog + @ApiOperation("app水电站集团") @GetMapping("/app/group") @ApiOperationSupport(order = 6) @@ -78,7 +78,7 @@ public class HydropowerController extends BladeController { return R.data(service.group(deptId)); } - @ApiLog + @ApiOperation("app水电站区域") @GetMapping("/app/area") @ApiOperationSupport(order = 7) @@ -86,7 +86,7 @@ public class HydropowerController extends BladeController { return R.data(service.area(deptId)); } - @ApiLog + @ApiOperation("app水电站区值班") @GetMapping("/app/area-duty") @ApiOperationSupport(order = 8) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java index f8520ed..fbdd818 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java @@ -5,6 +5,7 @@ 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.common.logs.utils.StringUtils; import com.hnac.hzims.operational.access.constants.AccessConstants; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.service.IOperAccessTaskService; @@ -23,9 +24,9 @@ import com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.apache.commons.lang.StringUtils; + import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -55,7 +56,7 @@ public class MainReportController extends BladeController { private final IOperPhenomenonService operPhenomenonService; - @ApiLog + @ApiOperationSupport(order = 10) @ApiOperation("缺陷报表") @GetMapping("/defect") @@ -97,7 +98,7 @@ public class MainReportController extends BladeController { return R.data(data); } - @ApiLog + @ApiOperationSupport(order = 20) @ApiOperation("运维报表(日常维护、巡检、检修)") @GetMapping("/operational") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java index 1acc2e0..9231c08 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainStatisticsController.java @@ -6,7 +6,7 @@ import com.hnac.hzims.operational.main.vo.EmStatisticsVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import com.hnac.hzims.operational.main.service.IMainStatisticsService; import com.hnac.hzims.operational.main.vo.DutyStatisticsVO; @@ -25,7 +25,7 @@ public class MainStatisticsController { @Autowired private IMainStatisticsService mainStatisticsService; - @ApiLog + @ApiOperationSupport(order = 10) @ApiOperation("获取运维统计值班统计") @GetMapping("/getDutyStatistics") @@ -34,7 +34,7 @@ public class MainStatisticsController { return R.data(DutyStatisticsVO); } - @ApiLog + @ApiOperationSupport(order = 20) @ApiOperation("获取运维统计设备统计") @GetMapping("/getEmStatistics") @@ -43,7 +43,7 @@ public class MainStatisticsController { return R.data(emStatisticsVO); } - @ApiLog + @ApiOperationSupport(order = 30) @ApiOperation("获取运维板块统计") @GetMapping("/getOperationStatistics") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java index 2ed2c1b..b4ff840 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java @@ -10,7 +10,7 @@ import com.hnac.hzims.operational.station.entity.StationEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springblade.system.entity.Dept; import org.springframework.web.bind.annotation.*; @@ -37,7 +37,7 @@ public class MainSystemMonitoringController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 20) @ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）") @PostMapping("/getHisDataByDept") @@ -52,7 +52,7 @@ public class MainSystemMonitoringController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 20) @ApiOperation("获取当时历史数据 （日发电量，月发电量，年发电量，有功功率）") @PostMapping("/getHisDataByDeptNew") @@ -66,7 +66,7 @@ public class MainSystemMonitoringController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 20) @ApiOperation("获取折线图") @PostMapping("/getTheDayHydrographNew") @@ -107,7 +107,7 @@ public class MainSystemMonitoringController { * @return */ //todo 机构 - @ApiLog + @ApiOperationSupport(order = 50) @ApiOperation("机构") @GetMapping("/dept/list") @@ -116,7 +116,7 @@ public class MainSystemMonitoringController { } - @ApiLog + @GetMapping("/listByAuth") @ApiOperationSupport(order = 100) @ApiOperation(value = "根据用户权限查询站点", notes = "") @@ -124,7 +124,7 @@ public class MainSystemMonitoringController { return R.data(mainSystemMonitoringService.doListByAuth(entity)); } - @ApiLog + @GetMapping("/listByAuthDept") @OperationAnnotation(moduleName = "值班管理", @@ -136,7 +136,7 @@ public class MainSystemMonitoringController { return R.data(mainSystemMonitoringService.doListByAuthDept()); } - @ApiLog + @GetMapping("/deptByAuthUser") @ApiOperationSupport(order = 100) @ApiOperation(value = "根据用户权限获取机构", notes = "") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java index b7cecd7..952ddb3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainTaskStatisticController.java @@ -7,7 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -26,14 +26,14 @@ import java.util.Map; public class MainTaskStatisticController extends BladeController { private final IMainTaskStatisticService statisticService; - @ApiLog + @RequestMapping(value = "/getMainTaskMonthCount",method = {RequestMethod.POST,RequestMethod.GET}) @ApiOperationSupport(order = 1) @ApiOperation("首页当月任务执行情况") public R> getMainTaskMonthCount() { return statisticService.getMainTaskMonthCount(); } - @ApiLog + @RequestMapping(value = "/getCurrentDutyTicketCount",method = {RequestMethod.POST,RequestMethod.GET}) @ApiOperationSupport(order = 2) @ApiOperation("首页当班票据统计") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java index 9f5cf5a..fc8ff2d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java @@ -16,7 +16,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -38,7 +38,7 @@ public class MainWorkBenchController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 10) @ApiOperation(value = "分页", notes = "传入StationEntity") @@ -80,14 +80,14 @@ public class MainWorkBenchController extends BladeController { @ApiOperationSupport(order = 40) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workBenchService.deleteLogic(Func.toLongList(ids))); + return R.status(workBenchService.removeByIds(Func.toLongList(ids))); } /** * 根据用户权限获取路由 * * @return - @ApiLog + @ApiOperationSupport(order = 50) @ApiOperation("获取路由") @PostMapping("/getHomePageWorkBench") @@ -95,7 +95,7 @@ public class MainWorkBenchController extends BladeController { return R.data(workBenchService.getHomePageWorkBench(vo)); }*/ - @ApiLog + @ApiOperationSupport(order = 60) @ApiOperation("首页工作台路由") @PostMapping("/getHomePageWorkBench") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java index 9e72c81..0dafe8a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PVAppMainController.java @@ -12,7 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; @@ -54,7 +54,7 @@ public class PVAppMainController extends BladeController { // redisTemplate.opsForValue().set(redisKeyConstants.getRealDataByRealId(),realData); // return R.success("保存成功"); // } - @ApiLog + @GetMapping("/getDeptDataByUser") @ApiOperation("获取用户光伏电站首页") @ApiOperationSupport(order = 2) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java index 388620d..62547ee 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PhotovoltaicController.java @@ -7,7 +7,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,7 +26,7 @@ public class PhotovoltaicController extends BladeController { private final PhotovoltaicService service; - @ApiLog + @ApiOperation("集团/区域关键指标") @GetMapping("/KPIs") @ApiOperationSupport(order = 1) @@ -34,7 +34,7 @@ public class PhotovoltaicController extends BladeController { return R.data(service.KPIs(deptId)); } - @ApiLog + @ApiOperation("集团/区域发电量") @GetMapping("/generation") @ApiOperationSupport(order = 2) @@ -43,7 +43,7 @@ public class PhotovoltaicController extends BladeController { return R.data(service.generation(deptId, type)); } - @ApiLog + @ApiOperation("集团/区域下属数据占比") @GetMapping("/subordinate") @ApiOperationSupport(order = 3) @@ -58,7 +58,7 @@ public class PhotovoltaicController extends BladeController { return R.data(service.station(deptId)); } - @ApiLog + @ApiOperation("App集团/区域数据") @GetMapping("/app_subordinate") @ApiOperationSupport(order = 3) @@ -66,7 +66,7 @@ public class PhotovoltaicController extends BladeController { return R.data(service.app_subordinate(deptId)); } - @ApiLog + @ApiOperation("App光伏站点数据") @GetMapping("/app_station") @ApiOperationSupport(order = 3) @@ -74,7 +74,7 @@ public class PhotovoltaicController extends BladeController { return R.data(service.app_station(deptId)); } - @ApiLog + @ApiOperation("App功率/发电量查询") @GetMapping("/app_load_generate") @ApiOperationSupport(order = 3) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java index fd8ae2a..a39501f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/PlatformController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +30,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 1) @ApiOperation("站点统计") @GetMapping("/stationCount") @@ -43,7 +43,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 2) @ApiOperation("云服务-关键指标") @GetMapping("/cloud-key-index") @@ -56,7 +56,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 3) @ApiOperation("云服务-告警信息") @GetMapping("/cloud-alarm-info") @@ -69,7 +69,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 4) @ApiOperation("云服务-月告警排名") @GetMapping("/cloud-alarm-ranking") @@ -82,7 +82,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 5) @ApiOperation("云服务-运行数据排名") @GetMapping("/cloud-run-data-ranking") @@ -96,7 +96,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 6) @ApiOperation("代运维-值班情况") @GetMapping("/with-operations-duty-situation") @@ -110,7 +110,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 7) @ApiOperation("代运维-任务情况") @GetMapping("/with-operations-task-situation") @@ -123,7 +123,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 8) @ApiOperation("代运维-关键指标") @GetMapping("/with-operations-key-index") @@ -137,7 +137,7 @@ public class PlatformController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 9) @ApiOperation("代运维-告警信息") @GetMapping("/with-operations-alarm-info") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java index bb47407..ae44b16 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java @@ -26,7 +26,7 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -61,7 +61,7 @@ public class RunMonthReportController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 1) @ApiOperation("根据站点获取运行月报--旧版") @GetMapping("/getByStation") @@ -235,7 +235,7 @@ public class RunMonthReportController extends BladeController { * * @return */ - @ApiLog + @ApiOperationSupport(order = 1) @ApiOperation("根据站点获取运行月报-新版") @GetMapping("/new/getByStation") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java index 04c462f..d44b36a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/ScanController.java @@ -7,7 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,21 +19,21 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "扫一扫", tags = "二维码扫一扫") public class ScanController { private final IScanService scanService; - @ApiLog + @GetMapping("/getData") @ApiOperationSupport(order = 1) @ApiOperation(value = "获取数据（消缺单、检修、日常维护等）", notes = "") public R getData(@ApiParam("设备编码") String emCode){ return R.data(scanService.getData(emCode)); } - @ApiLog + @GetMapping("/getRealDataTimeAndDeviceFile") @ApiOperationSupport(order = 2) @ApiOperation(value = "获取实时数据及设备档案）", notes = "") public R getRealDataTimeAndDeviceFile(@ApiParam("设备编码") String emCode){ return R.data(scanService.getRealDataTimeAndDeviceFile(emCode)); } - @ApiLog + @GetMapping("/getBusinessRecords") @ApiOperationSupport(order = 3) @ApiOperation(value = "获取业务档案）", notes = "") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java index 54c768d..c9c0db3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/SideHustleController.java @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +30,7 @@ public class SideHustleController extends BladeController { @NotNull private final ISideHustleService regionService; - @ApiLog + @ApiOperation("区域值班信息统计") @GetMapping("/areaDutyInfoCount") @ApiOperationSupport(order = 1) @@ -38,7 +38,7 @@ public class SideHustleController extends BladeController { List dutyInfoCountVoList = regionService.areaDutyInfoCount(deptId); return R.data(dutyInfoCountVoList); } - @ApiLog + @ApiOperation("集团/区域站点设备统计") @GetMapping("/equipmentStateCount") @ApiOperationSupport(order = 2) @@ -46,21 +46,21 @@ public class SideHustleController extends BladeController { List equipmentCountVoList = regionService.equipmentStateCount(deptId); return R.data(equipmentCountVoList); } - @ApiLog + @ApiOperation("集团/区域发电占比") @GetMapping("/areaPowerScale") @ApiOperationSupport(order = 3) public R> areaPowerScale(@ApiParam(value = "区域机构ID") Long deptId) { return R.data(regionService.areaPowerScale(deptId)); } - @ApiLog + @ApiOperation("集团/区域占比") @GetMapping("/areaScale") @ApiOperationSupport(order = 4) public R> areaScale(@ApiParam(value = "区域机构ID") Long deptId) { return R.data(regionService.areaScale(deptId)); } - @ApiLog + @ApiOperation("集团当月发电量完成情况") @GetMapping("/areaPowerMonth") @ApiOperationSupport(order = 5) @@ -69,7 +69,7 @@ public class SideHustleController extends BladeController { return R.data(powerFinishVoList); } - @ApiLog + @ApiOperation("区域当月发电量完成情况") @GetMapping("/powerFinishMonth") @ApiOperationSupport(order = 7) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java index d9056f3..78b39bf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/TaskRealTimeCountController.java @@ -7,7 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,7 +24,7 @@ public class TaskRealTimeCountController extends BladeController { /** * 获取任务实时数据统计 */ - @ApiLog + @GetMapping("/getRealTimeDataCount") @ApiOperationSupport(order = 1) @ApiOperation(value = "获取任务实时数据统计", notes = "") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java index 6a42ffd..d69796d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UnitRunningTimeController.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.main.service.IUnitRunningTimeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.Query; import org.springblade.core.tool.api.R; @@ -34,7 +34,7 @@ public class UnitRunningTimeController extends BladeController { /** * 查询分页数据 */ - @ApiLog + @ApiOperation(value = "查询分页数据") @RequestMapping(value = "/list") public R> list(UnitRunningTimeEntity entity, Query query){ @@ -46,7 +46,7 @@ public class UnitRunningTimeController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperation(value = "详情") public R detail(UnitRunningTimeEntity entity){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java index b5df6bd..4aace76 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WaterHomeController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,7 +26,7 @@ public class WaterHomeController extends BladeController { @NotNull private final IWaterService service; - @ApiLog + @ApiOperation("水利指标") @GetMapping("/waterConservancy") @ApiOperationSupport(order = 1) @@ -35,7 +35,7 @@ public class WaterHomeController extends BladeController { return R.data(response); } - @ApiLog + @ApiOperation("水利区域/站点详情") @GetMapping("/waterDetails") @ApiOperationSupport(order = 2) @@ -44,7 +44,7 @@ public class WaterHomeController extends BladeController { return R.data(list); } - @ApiLog + @ApiOperation("水利用电排行") @GetMapping("/waterUseEleRanking") @ApiOperationSupport(order = 3) @@ -53,7 +53,7 @@ public class WaterHomeController extends BladeController { return R.data(list); } - @ApiLog + @ApiOperation("水利近年数据对比：用电量") @GetMapping("/waterYearCompare") @ApiOperationSupport(order = 4) @@ -70,7 +70,7 @@ public class WaterHomeController extends BladeController { return R.data(list); } - @ApiLog + @ApiOperation("水利站点首页") @GetMapping("/waterStationPage") @ApiOperationSupport(order = 6) @@ -78,7 +78,7 @@ public class WaterHomeController extends BladeController { WaterStationVo response = service.waterStationPage(deptId); return R.data(response); } - @ApiLog + @ApiOperation("泵组列表") @GetMapping("/getPumpList") @ApiOperationSupport(order = 7) @@ -86,7 +86,7 @@ public class WaterHomeController extends BladeController { List list = service.getPumpList(deptId); return R.data(list); } - @ApiLog + @ApiOperation("闸门列表") @GetMapping("/getGateList") @ApiOperationSupport(order = 8) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WindHomeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WindHomeController.java index 6d2781a..590c902 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WindHomeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/WindHomeController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,7 +27,7 @@ public class WindHomeController extends BladeController { private final WindHomeService service; - @ApiLog + @ApiOperation("风电站集团/区域指标") @GetMapping("/KPIs") @ApiOperationSupport(order = 1) @@ -35,7 +35,7 @@ public class WindHomeController extends BladeController { return R.data(service.KPIs(deptId)); } - @ApiLog + @ApiOperation("风电站集团/区域占比") @GetMapping("/subordinate") @ApiOperationSupport(order = 2) @@ -43,7 +43,7 @@ public class WindHomeController extends BladeController { return R.data(service.subordinate(deptId)); } - @ApiLog + @ApiOperation("风电站点指标数据") @GetMapping("/station") @ApiOperationSupport(order = 3) @@ -51,7 +51,7 @@ public class WindHomeController extends BladeController { return R.data(service.station(deptId)); } - @ApiLog + @ApiOperation("风电站点发电量") @GetMapping("/generation") @ApiOperationSupport(order = 4) @@ -59,7 +59,7 @@ public class WindHomeController extends BladeController { return R.data(service.generation(deptId)); } - @ApiLog + @ApiOperation("风电站点月份曲线数据") @GetMapping("/target_curve") @ApiOperationSupport(order = 3) @@ -67,7 +67,7 @@ public class WindHomeController extends BladeController { return R.data(service.target_curve(deptId)); } - @ApiLog + @ApiOperation("风电站点App指标数据") @GetMapping("/app_kpi") @ApiOperationSupport(order = 3) @@ -75,7 +75,7 @@ public class WindHomeController extends BladeController { return R.data(service.app_kpi()); } - @ApiLog + @ApiOperation("风电站区域数据") @GetMapping("/app_area") @ApiOperationSupport(order = 3) @@ -83,7 +83,7 @@ public class WindHomeController extends BladeController { return R.data(service.app_area(deptId)); } - @ApiLog + @ApiOperation("风电站区域统计数据") @GetMapping("/app_subordinate") @ApiOperationSupport(order = 3) @@ -91,7 +91,7 @@ public class WindHomeController extends BladeController { return R.data(service.app_subordinate(deptId)); } - @ApiLog + @ApiOperation("风电站区域指标/值班数据") @GetMapping("/app_area_duty") @ApiOperationSupport(order = 3) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainReportMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainReportMapper.java index 9461f2f..343446d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainReportMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainReportMapper.java @@ -1,11 +1,5 @@ package com.hnac.hzims.operational.main.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; -import com.hnac.hzims.operational.report.vo.AccessReportVO; -import com.hnac.hzims.operational.report.vo.PersonalMonthsReportVO; - -import java.util.List; -import java.util.Map; public interface MainReportMapper { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java index 402c677..c51937f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java @@ -7,7 +7,7 @@ import com.hnac.hzims.operational.station.service.IStationService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; @@ -55,8 +55,6 @@ public class ScheduledCreateTask { @Autowired private IMainSystemMonitoringService mainSystemMonitoringService; - @Autowired - BladeLogger logger; private final static Integer SERVE_TYPE = 2; @@ -69,7 +67,7 @@ public class ScheduledCreateTask { //@Scheduled(cron = "0/1 * * * * ? ") @XxlJob(TASK_VALUE_RUN_REPORT_CREATE) public ReturnT runReport(String param) throws Exception { - logger.info("runReportCreateHandler", "运行月报定时任务"); + log.info("runReportCreateHandler", "运行月报定时任务"); String date = DateUtils.monthDate(new Date(), -1, "yyyy-MM"); if (Func.isNotBlank(param)) { date = DateUtils.monthDate(DateUtil.parse(param, "yyyy-MM"), -1, "yyyy-MM"); @@ -121,7 +119,7 @@ public class ScheduledCreateTask { @XxlJob(TASK_VALUE_SYSTEM_MONITORING_HIS_DATA_CREATE_NEW) //@Scheduled(cron = "0/20 * * * * ? ") public ReturnT hisDataNew(String param) throws Exception { - logger.info("His", "首页His"); + log.info("His", "首页His"); mainSystemMonitoringService.getHisDataByDeptRedisNew(1, "0"); return new ReturnT<>("SUCCESS"); } @@ -136,7 +134,7 @@ public class ScheduledCreateTask { //@Scheduled(cron = "0/10 * * * * ? ") @XxlJob(TASK_VALUE_SYSTEM_MONITORING_DAY_LINE_CHART_CREATE_NEW) public ReturnT lineChartNew(String param) throws Exception { - logger.info("The", "首页The"); + log.info("The", "首页The"); //mainSystemMonitoringService.getTheDayHydrographRedisNew(null, "0"); return new ReturnT<>("SUCCESS"); } @@ -150,7 +148,7 @@ public class ScheduledCreateTask { //@Scheduled(cron = "0/10 * * * * ? ") @XxlJob(TASK_VALUE_GAIN_UNIT_THE_MONTH_THE_RUNNING_TIME) public ReturnT theRunningTime(String param) throws Exception { - logger.info("gainUnitTheMonthTheRunningTime", "获取机组当月运行时长"); + log.info("gainUnitTheMonthTheRunningTime", "获取机组当月运行时长"); if (Func.isBlank(param)) { param = DateUtil.format(new Date(), DateUtil.PATTERN_DATE); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java index f52a203..6a7d625 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java @@ -1,17 +1,18 @@ package com.hnac.hzims.operational.main.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.entity.MainWorkBenchEntity; import com.hnac.hzims.operational.main.vo.InDustryVo; import com.hnac.hzims.operational.main.vo.MainWorkBenchVO; import com.hnac.hzims.operational.main.vo.RoutingParamVo; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; -public interface IMainWorkBenchService extends BaseService { +public interface IMainWorkBenchService extends IService { IPage list(MainWorkBenchEntity req, Query query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUnitRunningTimeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUnitRunningTimeService.java index 8387c13..0f1441f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUnitRunningTimeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUnitRunningTimeService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.main.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.entity.UnitRunningTimeEntity; -import org.springblade.core.mp.base.BaseService; + /** *

@@ -11,7 +12,7 @@ import org.springblade.core.mp.base.BaseService; * @author lx * @since 2022-02-22 */ -public interface IUnitRunningTimeService extends BaseService { +public interface IUnitRunningTimeService extends IService { /** * 获取机组当月运行时长 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/UserDeptService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/UserDeptService.java index 7c28df7..4b3a458 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/UserDeptService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/UserDeptService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.main.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.entity.UserDeptEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface UserDeptService extends BaseService { +public interface UserDeptService extends IService { } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java index 171d8bc..4b6d779 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java @@ -41,7 +41,7 @@ import com.hnac.hzinfo.datasearch.soe.domian.SoeData; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -82,7 +82,6 @@ public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringSer private final RedisTemplate redisTemplate; private final StFocusPropertiesService stFocusPropertiesService; private final IUnitRunningTimeService unitRunningTimeService; - private final BladeLogger logger; @Value("${hzims.operation.homePage.systemMonitoring.hydropowerStation.hisData}") public String hisData; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java index 500ecd8..aaed744 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.main.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.main.entity.MainWorkBenchEntity; import com.hnac.hzims.operational.main.mapper.MainWorkBenchMapper; import com.hnac.hzims.operational.main.service.IMainWorkBenchService; @@ -15,8 +16,8 @@ import com.hnac.hzims.operational.main.constant.HomePageConstant; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.service.IStationService; import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang.StringUtils; -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.Query; import org.springblade.core.secure.BladeUser; @@ -34,7 +35,7 @@ import java.util.*; import java.util.stream.Collectors; @Service -public class MainWorkBenchServiceImpl extends BaseServiceImpl implements IMainWorkBenchService { +public class MainWorkBenchServiceImpl extends ServiceImpl implements IMainWorkBenchService { @Autowired private IStationService stationService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java index 2a755e2..9f903f7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; import lombok.RequiredArgsConstructor; -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.utils.*; import org.springframework.beans.factory.annotation.Value; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class UnitRunningTimeServiceImpl extends BaseServiceImpl implements IUnitRunningTimeService { +public class UnitRunningTimeServiceImpl extends ServiceImpl implements IUnitRunningTimeService { private final IHistoryDataSearchClient historyDataSearchClient; private final IAnalyseDataSearchClient analyseDataSearchClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserDeptServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserDeptServiceImpl.java index 4d1b7df..78e2538 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserDeptServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserDeptServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.operational.main.entity.UserDeptEntity; import com.hnac.hzims.operational.main.mapper.UserDeptMapper; import com.hnac.hzims.operational.main.service.UserDeptService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class UserDeptServiceImpl extends BaseServiceImpl implements UserDeptService { +public class UserDeptServiceImpl extends ServiceImpl implements UserDeptService { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java index 491b2f7..ac3d792 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -42,7 +42,7 @@ public class OperMaintenanceLibraryController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(libraryService.deleteLogic(Func.toLongList(ids))); + return R.status(libraryService.removeByIds(Func.toLongList(ids))); } /** @@ -84,7 +84,7 @@ public class OperMaintenanceLibraryController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "日常维护",title = "设备维护库",operatorType = OperatorType.MOBILE,businessType = @@ -95,7 +95,7 @@ public class OperMaintenanceLibraryController extends BladeController { return libraryService.list(req, query); } - @ApiLog + @GetMapping("/generatePlan") @ApiOperationSupport(order = 60) @ApiOperation(value = "生成日常维护任务") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java index 39acf0d..8354ea4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceMonitorController.java @@ -11,7 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,7 +37,7 @@ public class OperMaintenanceMonitorController extends BladeController { /** * 监控月报表 */ - @ApiLog + @GetMapping("/report/month") @ApiOperationSupport(order = 40) @ApiOperation(value = "监控月报表") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java index ae9c0e8..faaeef8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceParameterController.java @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -39,7 +39,7 @@ public class OperMaintenanceParameterController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(parameterService.deleteLogic(Func.toLongList(ids))); + return R.status(parameterService.removeByIds(Func.toLongList(ids))); } /** @@ -65,7 +65,7 @@ public class OperMaintenanceParameterController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -76,7 +76,7 @@ public class OperMaintenanceParameterController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:emCode,typeCode,refLibraryId,disposer") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java index 07de95b..dac091e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenancePlanController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -53,7 +53,7 @@ public class OperMaintenancePlanController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(planService.deleteLogic(Func.toLongList(ids))); + return R.status(planService.removeByIds(Func.toLongList(ids))); } /** @@ -94,7 +94,7 @@ public class OperMaintenancePlanController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -105,7 +105,7 @@ public class OperMaintenancePlanController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:refLibraryId,disposer") @@ -116,7 +116,7 @@ public class OperMaintenancePlanController extends BladeController { public R> list(OperMaintenancePlanDTO req, Query query) { return planService.list(req, query); } - @ApiLog + @GetMapping("/generateTask") @ApiOperationSupport(order = 60) @ApiOperation(value = "根据计划ID生成任务") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java index 8202694..a414138 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java @@ -1,6 +1,5 @@ package com.hnac.hzims.operational.maintenance.controller; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -26,7 +25,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -76,7 +75,7 @@ public class OperMaintenanceTaskController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(taskService.deleteLogic(Func.toLongList(ids))); + return R.status(taskService.removeByIds(Func.toLongList(ids))); } /** @@ -102,7 +101,6 @@ public class OperMaintenanceTaskController extends BladeController { /** * 详情 */ - @ApiLog @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情") @@ -113,7 +111,6 @@ public class OperMaintenanceTaskController extends BladeController { /** * 分页 */ - @ApiLog @PostMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status") @@ -125,7 +122,6 @@ public class OperMaintenanceTaskController extends BladeController { return taskService.list(req); } - @ApiLog @PostMapping("/exportMaintenance") @ApiOperationSupport(order = 2) @ApiOperation(value = "日常维护记录导出") @@ -165,7 +161,7 @@ public class OperMaintenanceTaskController extends BladeController { map.put("isSuccess", "false"); map.put("msg", "日常维护记录统计报表导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } @@ -203,7 +199,6 @@ public class OperMaintenanceTaskController extends BladeController { return taskService.completeTask(req, completeTask); } - @ApiLog @PostMapping("/deleteTaskBatch") @ApiOperationSupport(order = 90) @ApiOperation(value = "删除日常维护工作流任务") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java index 55e2c08..4044a52 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java @@ -1,6 +1,7 @@ package com.hnac.hzims.operational.maintenance.mapper; -import com.baomidou.mybatisplus.annotation.SqlParser; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; + import com.hnac.hzims.operational.report.vo.MaintenanceReportVO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import org.apache.ibatis.annotations.Param; @@ -18,10 +19,10 @@ public interface OperMaintenanceTaskMapper extends UserDataScopeBaseMapper selectByEmCode(String emCode, List list); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List getMaintenanceStatisticsByDisposer(Map params); - @SqlParser(filter = true) + @InterceptorIgnore(tenantLine = "true") List> getMaintenanceConclusion(Map params); List selectMaintenanceTask(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list")List list); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index ad4a48f..49415b1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.maintenance.scheduled; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.message.dto.PlanMsgRecordDto; import com.hnac.hzims.message.entity.config.MessageTemplateEntity; import com.hnac.hzims.message.fegin.IMessageClient; @@ -21,8 +22,8 @@ import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.springblade.core.log.logger.BladeLogger; + + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.flow.core.entity.BladeFlow; @@ -62,7 +63,7 @@ public class MaintenanceTaskCreateTask { private final IOperMaintenanceTaskService taskService; private final IImsDutyMainService mainService; private final RedisTemplate redisTemplate; - private final BladeLogger logger; + private final IMessageClient messageClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java index fe22696..70bbe2f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.maintenance.scheduled; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.constants.FlowKeyConstants; @@ -22,9 +23,8 @@ import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; -import org.springblade.core.log.logger.BladeLogger; + + import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -56,7 +56,6 @@ import static com.hnac.hzims.operational.maintenance.constants.ScheduledConstant @AllArgsConstructor public class MaintenanceTaskSchedule { - private final BladeLogger logger; private final IOperMaintenancePlanService planService; private final IOperMaintenanceTaskService taskService; private final IFlowClient flowClient; @@ -114,7 +113,7 @@ public class MaintenanceTaskSchedule { planService.update(Wrappers.lambdaUpdate().set(OperMaintenancePlanEntity::getCreateTaskTime,new Date()).eq(OperMaintenancePlanEntity::getId,plan.getId())); } catch(Exception e) { - logger.error("MaintenanceTaskSchedule:generateTaskByPlan",e.getLocalizedMessage()); + log.error("MaintenanceTaskSchedule:generateTaskByPlan",e.getLocalizedMessage()); XxlJobLogger.log(plan.getId()+"计划创建任务失败"); // 查询到日常维护计划所创建的任务 List maintenanceTasks = taskService.list(Wrappers.lambdaQuery().eq(OperMaintenanceTaskEntity::getPlanId, plan.getId())); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceLibraryService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceLibraryService.java index b50070b..efbf8fa 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceLibraryService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceLibraryService.java @@ -2,11 +2,12 @@ package com.hnac.hzims.operational.maintenance.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.common.support.constants.Order; import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceLibraryDTO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceLibraryEntity; import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceLibraryVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.util.HashMap; * * @author Chill */ -public interface IOperMaintenanceLibraryService extends BaseService { +public interface IOperMaintenanceLibraryService extends IService { R doSave(OperMaintenanceLibraryDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceParameterService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceParameterService.java index b38996a..549b882 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceParameterService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceParameterService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.maintenance.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceParameterDTO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceParameterEntity; import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceParameterVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,7 +14,7 @@ import org.springblade.core.tool.api.R; * * @author Chill */ -public interface IOperMaintenanceParameterService extends BaseService { +public interface IOperMaintenanceParameterService extends IService { R detail(Long id); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenancePlanService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenancePlanService.java index e6339d6..b08253c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenancePlanService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenancePlanService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.maintenance.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.maintenance.dto.OperMaintenancePlanDTO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; import com.hnac.hzims.operational.maintenance.vo.OperMaintenancePlanVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -13,7 +14,7 @@ import org.springblade.core.tool.api.R; * * @author Chill */ -public interface IOperMaintenancePlanService extends BaseService { +public interface IOperMaintenancePlanService extends IService { R detail(Long id); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceTaskService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceTaskService.java index bce1e00..483e90e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceTaskService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IOperMaintenanceTaskService.java @@ -2,6 +2,7 @@ package com.hnac.hzims.operational.maintenance.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.vo.RegularWorkVO; import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; @@ -13,7 +14,7 @@ import com.hnac.hzims.ticket.areamonthly.vo.MaintenanceTaskVo; import com.hnac.hzims.ticket.areamonthly.vo.MaintenanceTaskWithAreaVo; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; import org.springframework.web.bind.annotation.RequestParam; @@ -27,7 +28,7 @@ import java.util.Map; * * @author Chill */ -public interface IOperMaintenanceTaskService extends BaseService { +public interface IOperMaintenanceTaskService extends IService { R doSave(OperMaintenanceTaskDTO req); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index bc4c8a3..dcb009a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.common.utils.DateUtil; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; @@ -28,7 +29,7 @@ import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo; import com.hnac.hzims.operational.util.StringObjUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.math.NumberUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceLibraryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceLibraryServiceImpl.java index d7ec498..ad2d044 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceLibraryServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceLibraryServiceImpl.java @@ -14,10 +14,10 @@ import com.hnac.hzims.operational.maintenance.wrapper.OperMaintenanceLibraryWrap import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.RandomUtils; -import org.springblade.core.log.logger.BladeLogger; -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.Query; import org.springblade.core.tool.api.R; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class OperMaintenanceLibraryServiceImpl extends BaseServiceImpl implements IOperMaintenanceLibraryService { +public class OperMaintenanceLibraryServiceImpl extends ServiceImpl implements IOperMaintenanceLibraryService { private final IDangerSourceClient dangerSourceClient; @@ -95,8 +95,7 @@ public class OperMaintenanceLibraryServiceImpl extends BaseServiceImpl implements IOperMaintenanceParameterService { +public class OperMaintenanceParameterServiceImpl extends ServiceImpl implements IOperMaintenanceParameterService { @Override public R detail(Long id) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java index 83e30e3..b8565c5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java @@ -22,8 +22,8 @@ import com.hnac.hzims.operational.maintenance.wrapper.OperMaintenancePlanWrapper import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.log.logger.BladeLogger; -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.Query; import org.springblade.core.tool.api.R; @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class OperMaintenancePlanServiceImpl extends BaseServiceImpl implements IOperMaintenancePlanService { +public class OperMaintenancePlanServiceImpl extends ServiceImpl implements IOperMaintenancePlanService { private final IDangerSourceClient dangerSourceClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java index 535e981..213d1d4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.defect.constants.DefectConstant; @@ -33,11 +34,11 @@ import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.apache.commons.lang3.RandomUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -77,7 +78,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class OperMaintenanceTaskServiceImpl extends BaseServiceImpl implements IOperMaintenanceTaskService { +public class OperMaintenanceTaskServiceImpl extends ServiceImpl implements IOperMaintenanceTaskService { private final IDangerSourceClient dangerSourceClient; private final OperMaintenanceTaskMapper operMaintenanceTaskMapper; private final OperPhenomenonMapper operPhenomenonMapper; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java index 5226e14..36b7c34 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java @@ -12,7 +12,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -32,27 +32,27 @@ import java.util.List; public class DeptController extends BladeController { private final IDeptService deptService; - @ApiLog + @RequestMapping("/getDeptLeafNode") public R getDeptLeafNode(){ return R.data(deptService.getDeptList()); } - @ApiLog + @GetMapping("/getCurrentUserDept") public R> getCurrentUserDept(@RequestParam(required = false) String name,@RequestParam(required = false) String type){ return R.data(deptService.getCurrentUserDept(name,type)); } - @ApiLog + @ApiOperation(value = "智能告警权限机构",notes = "智能告警") @GetMapping("/alarmDeptByCurrentUser") public R> alarmDeptByCurrentUser(){ return R.data(deptService.alarmDeptByCurrentUser()); } - @ApiLog + @ApiOperation(value = "区域机构",notes = "下拉框区域") @GetMapping("/select_area") public R> selectArea(@RequestParam(value = "serveType") Integer serveType, @RequestParam(value = "type") Integer type){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java index 7ed52aa..f9d5522 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/MonthReportController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jdk.nashorn.internal.objects.annotations.Getter; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.system.entity.Dept; @@ -61,7 +61,7 @@ public class MonthReportController { return R.success("执行完成"); } - @ApiLog + @GetMapping("/getStationMonthReportByStationCode") @ApiOperation(value = "根据站点编码获取站点月报",notes = "根据站点编码获取站点月报") @ApiOperationSupport(order = 1) @@ -76,7 +76,7 @@ public class MonthReportController { return R.data(stationReportAllVO); } - @ApiLog + @GetMapping("/setStationMonthReportByStationCode") @ApiOperation(value = "根据站点编码生成站点月报",notes = "根据站点编码获取站点月报") @ApiOperationSupport(order = 1) @@ -90,7 +90,7 @@ public class MonthReportController { monthReportService.setStationMonthReportByStationCode(deptId,month); } // -// @ApiLog +// // @GetMapping("/getPersonalMonthReport") // @ApiOperation(value = "获取当前登录人个人月报",notes = "获取当前登录人个人月报") // @ApiOperationSupport(order = 2) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/IMonthReportService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/IMonthReportService.java index 7c6b1a5..146fc7b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/IMonthReportService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/IMonthReportService.java @@ -1,13 +1,14 @@ package com.hnac.hzims.operational.report.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO; import com.hnac.hzims.operational.report.vo.StationReportAllVO; import com.hnac.hzims.operational.report.entity.OperMonthReportEntity; import com.hnac.hzims.operational.report.vo.StationRunReportAllVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; -public interface IMonthReportService extends BaseService { +public interface IMonthReportService extends IService { /** * 查询站点月报 * @param deptId diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthReportService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthReportService.java index 68bca91..773d9f3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthReportService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthReportService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.report.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.report.entity.RunMonthEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface RunMonthReportService extends BaseService { +public interface RunMonthReportService extends IService { } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthService.java index bed8fde..416d45d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/RunMonthService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.report.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.report.entity.RunMonthEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface RunMonthService extends BaseService { +public interface RunMonthService extends IService { RunMonthEntity data(String mon, String stationCode); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/MonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/MonthReportServiceImpl.java index 02b30ed..d266f17 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/MonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/MonthReportServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.operational.report.utils.ObjectHelper; import com.hnac.hzims.operational.report.vo.StationRunReportAllVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -32,7 +32,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class MonthReportServiceImpl extends BaseServiceImpl implements IMonthReportService { +public class MonthReportServiceImpl extends ServiceImpl implements IMonthReportService { private final IOperPersonalMonthReportService operPersonalMonthReportService; private final IOperStationMonthReportService operStationMonthReportService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java index 416a1d9..0a560d3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java @@ -46,7 +46,7 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.*; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.system.entity.Dept; @@ -103,7 +103,6 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor private final IUserClient userClient; private final IInspectTaskReportClient taskReportClient; private final ITicketInfoAllClient ticketInfoAllClient; - private final BladeLogger logger; private final SoeDataClient soeDataClient; /** @@ -512,7 +511,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor countDownLatch.await(); } catch (InterruptedException e) { e.printStackTrace(); - logger.error(e.getMessage(), e.toString()); + log.error(e.getMessage(), e.toString()); Thread.currentThread().interrupt(); } //小结 @@ -764,7 +763,7 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor * @param type */ private void fillReport(XSSFSheet sheet, StationReportAllVO stationReportAllVO, String type) { - logger.info("hzims:operational:station:report", JSON.toJSONString(stationReportAllVO)); + log.info("hzims:operational:station:report", JSON.toJSONString(stationReportAllVO)); //当前行数 int currentRowNum = 0; //填充标题 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonReportServiceImpl.java index 8dda69a..16ebd9c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonReportServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.operational.report.mapper.RunMonReportMapper; import com.hnac.hzims.operational.report.service.RunMonthReportService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @Slf4j -public class RunMonReportServiceImpl extends BaseServiceImpl implements RunMonthReportService { +public class RunMonReportServiceImpl extends ServiceImpl implements RunMonthReportService { } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java index 60c6d4d..0258e79 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java @@ -46,7 +46,7 @@ import org.apache.poi.ss.usermodel.charts.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; 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.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.*; @@ -72,7 +72,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class RunMonthServiceImpl extends BaseServiceImpl implements RunMonthService { +public class RunMonthServiceImpl extends ServiceImpl implements RunMonthService { private final IStationService stationService; @@ -286,7 +286,7 @@ public class RunMonthServiceImpl extends BaseServiceImpl remove (@RequestParam @ApiParam("主键ID，按逗号分隔") String ids) { return R.status(mainPageConfService.removeByIds(Func.toLongList(",",ids))); } - @ApiLog + @GetMapping("/listPage") @ApiOperation("分页查询大屏首页配置") @ApiOperationSupport(order = 3) @@ -74,7 +73,7 @@ public class MainPageConfController { }); return R.status(mainPageConfService.updateById(req)); } - @ApiLog + @GetMapping("/list") @ApiOperation("更新大屏首页配置查询") @ApiOperationSupport(order = 5) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/IMainPageConfService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/IMainPageConfService.java index ce5b3d4..b0436c2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/IMainPageConfService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/IMainPageConfService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.screen.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.screen.dto.MainPageConfDto; import com.hnac.hzims.operational.screen.entity.MainPageConfEntity; import com.hnac.hzims.operational.screen.vo.MainPageConfVo; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; /** * @author hx */ -public interface IMainPageConfService extends BaseService { +public interface IMainPageConfService extends IService { /** * 分页查询大屏首页 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/impl/MainPageConfServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/impl/MainPageConfServiceImpl.java index 447a263..67a2a2a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/impl/MainPageConfServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/service/impl/MainPageConfServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.operational.screen.vo.MainPageConfVo; import com.hnac.hzims.operational.screen.wrapper.MainPageConfWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -28,7 +28,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class MainPageConfServiceImpl extends BaseServiceImpl implements IMainPageConfService { +public class MainPageConfServiceImpl extends ServiceImpl implements IMainPageConfService { public static String ADMIN_ACCOUNT = "admin"; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/aspect/UpdateCodeAspect.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/aspect/UpdateCodeAspect.java index ac360b0..4018d0d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/aspect/UpdateCodeAspect.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/aspect/UpdateCodeAspect.java @@ -20,7 +20,7 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java index f1fad85..25a74e2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiOperation; import javafx.beans.binding.BooleanBinding; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -31,14 +31,14 @@ public class ControlUsersController extends BladeController { public R save(@RequestBody ControlUsersEntity req) { return R.status(controlUsersService.save(req)); } - @ApiLog + @GetMapping("/listPage") @ApiOperation("分页查询") @ApiOperationSupport(order = 2) public R> listPage(ControlUsersEntity req, Query query) { return R.data(controlUsersService.listPage(req,query)); } - @ApiLog + @GetMapping("/detail") @ApiOperation("查看详情") @ApiOperationSupport(order = 3) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java index 526ad77..973471b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/HzimsAnalyzeModelStationController.java @@ -12,7 +12,7 @@ import com.hnac.hzims.operational.station.service.IHzimsAnalyzeModelStationServi import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.Query; import org.springblade.core.tool.api.R; @@ -45,7 +45,7 @@ public class HzimsAnalyzeModelStationController extends BladeController { /** * 查询分页数据 */ - @ApiLog + @ApiOperation(value = "查询分页数据") @GetMapping(value = "/list") @OperationAnnotation( @@ -61,7 +61,7 @@ public class HzimsAnalyzeModelStationController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperation(value = "详情") public R detail(HzimsAnalyzeModelStationEntity entity) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java index 8d6ba21..3b1cbf0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.station.vo.DeptTreeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -39,7 +39,7 @@ public class ImsDeptController { /** * 查询分页数据 */ - @ApiLog + @ApiOperation(value = "查询分页数据") @RequestMapping(value = "/list") public R> list(ImsDeptEntity entity, Query query) { @@ -51,7 +51,7 @@ public class ImsDeptController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperation(value = "详情") public R detail(ImsDeptEntity entity) { @@ -91,7 +91,7 @@ public class ImsDeptController { /** * 获取站点机构树 */ - @ApiLog + @ApiOperation(value = "获取水电站机构树") @GetMapping(value = "/getHydropowerTree") public R> getHydropowerTree(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer stationType,@RequestParam(required = false) Integer serveType) { @@ -104,7 +104,7 @@ public class ImsDeptController { /** * 获取权限区域 */ - @ApiLog + @ApiOperation(value = "获取权限区域") @GetMapping(value = "/getTypeArea") public R> getTypeArea(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer typeArea,Long deptId) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java index 0f6a0d0..2e1bed8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationAttributeController.java @@ -16,7 +16,7 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -41,13 +41,13 @@ public class StationAttributeController extends BladeController { private final IStationAttributeService stationAttributeService; private final IStationAttrConfigService stationAttrConfigService; - @ApiLog + @GetMapping("/getMainList") @ApiOperation("查詢某站点属性配置主页面") public R getMainList(StationAttributeDto attributeDto, Query query) { return stationAttributeService.getMainList(attributeDto,query); } - @ApiLog + @GetMapping("/listPage") @ApiOperation("查詢屬性详情") @ApiImplicitParams({ @@ -81,14 +81,14 @@ public class StationAttributeController extends BladeController { if(CollectionUtil.isEmpty(stationAttributeEntityList)){ return R.success("暂未找到相关记录删除"); } - return R.status(stationAttributeService.deleteLogic(stationAttributeEntityList.stream().map(StationAttributeEntity::getId).collect(Collectors.toList()))); + return R.status(stationAttributeService.removeByIds(stationAttributeEntityList.stream().map(StationAttributeEntity::getId).collect(Collectors.toList()))); } @GetMapping("/removeByIds") @ApiOperation("删除站点属性配置") @ApiOperationSupport(order = 4) public R removeByIds(@RequestParam String ids) { - return R.status(stationAttributeService.deleteLogic(Func.toLongList(ids))); + return R.status(stationAttributeService.removeByIds(Func.toLongList(ids))); } @GetMapping("/bandingMonitor") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java index ce3a5c3..42e185d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -47,7 +47,6 @@ public class StationController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 10) @ApiOperation(value = "分页", notes = "传入StationEntity") @@ -129,7 +128,7 @@ public class StationController extends BladeController { return R.data(stationService.getStationByCode(code)); } - @ApiLog + @GetMapping(value = "/getList") @ApiOperationSupport(order = 70) @ApiOperation(value = "获取站点列表（不分页查询）", notes = "传入StationEntity") @@ -141,7 +140,7 @@ public class StationController extends BladeController { return R.data(stationService.list(lwq)); } - @ApiLog + @GetMapping("/list/all") @ApiOperationSupport(order = 80) @ApiOperation(value = "查询所有", notes = "") @@ -149,7 +148,7 @@ public class StationController extends BladeController { return R.data(stationService.getAll()); } - @ApiLog + @GetMapping("/listByServeType") @ApiOperationSupport(order = 90) @ApiOperation(value = "根据服务类型查询站点", notes = "") @@ -157,7 +156,7 @@ public class StationController extends BladeController { return R.data(stationService.doListByServeType(serveType)); } - @ApiLog + @GetMapping("/listByType") @ApiOperationSupport(order = 90) @ApiOperation(value = "根据服务类型查询站点", notes = "") @@ -175,7 +174,7 @@ public class StationController extends BladeController { return R.data(list); } - @ApiLog + @GetMapping("/getHomeStationList") @ApiOperationSupport(order = 91) @ApiOperation(value = "获取首页地图站点列表", notes = "") @@ -183,7 +182,7 @@ public class StationController extends BladeController { return R.data(stationService.homeMapStationVo()); } - @ApiLog + @GetMapping("/select") @ApiOperationSupport(order = 1) @ApiOperation(value = "下拉站点列表", notes = "") @@ -191,7 +190,7 @@ public class StationController extends BladeController { return R.data(stationService.select(type, serveType)); } - @ApiLog + @GetMapping("/accessHydropower") @ApiOperationSupport(order = 2) @ApiOperation(value = "接入水电站点列表查询", notes = "") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java index bcc3d17..bc8628f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationUserController.java @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -51,7 +51,7 @@ public class StationUserController extends BladeController { return R.status(stationUserService.removeByIds(Func.toLongList(",",ids))); } - @ApiLog + @GetMapping("/listPage") @ApiOperation("分页") @ApiOperationSupport(order = 4) @@ -59,7 +59,7 @@ public class StationUserController extends BladeController { return R.data(stationUserService.listPage(query,req)); } - @ApiLog + @GetMapping("/list") @ApiOperation("查询列表") @ApiOperationSupport(order = 5) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java index e048147..f5382aa 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java @@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; 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.Query; import org.springblade.core.secure.BladeUser; @@ -79,7 +79,7 @@ public class StationVideoTypeController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 10) @ApiOperation(value = "分页", notes = "传入stationVideoType") @@ -147,10 +147,10 @@ public class StationVideoTypeController extends BladeController { @ApiOperationSupport(order = 40) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids))); + return R.status(stationVideoTypeService.removeByIds(Func.toLongList(ids))); } - @ApiLog + @RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 50) @ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表") @@ -159,7 +159,7 @@ public class StationVideoTypeController extends BladeController { return R.data(result); } - @ApiLog + @RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 60) @ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象") @@ -167,13 +167,13 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getById(id, streamType)); } - @ApiLog + @RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST}) public R getHikVideo() { return R.data(stationVideoTypeService.getHikVideo()); } - @ApiLog + @RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 70) @ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点") @@ -181,7 +181,7 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getStationsByVideo()); } - @ApiLog + @GetMapping("/getStationVideoOrderBySort") @ApiOperationSupport(order = 80) @ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表") @@ -189,7 +189,7 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO, query)); } - @ApiLog + @RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperationSupport(order = 90) @ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址") @@ -197,7 +197,7 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getVideoByIdsAndType(ids, type)); } - @ApiLog + @GetMapping("/getVideoByIds") @ApiOperationSupport(order = 100) @ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址") @@ -205,13 +205,13 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getVideoByIds(ids, randomCode)); } - @ApiLog + @RequestMapping(value = "/getVideoReviewerToken", method = {RequestMethod.GET, RequestMethod.POST}) public R getVideoReviewerToken() { return R.data(stationVideoTypeService.getVideoReviewerToken()); } - @ApiLog + @GetMapping("/getVideoMonitorByAgency") @ApiOperationSupport(order = 110) @ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频") @@ -219,7 +219,7 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getVideoMonitor(type)); } - @ApiLog + @GetMapping("/getHikVisionStations") @ApiOperationSupport(order = 120) @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表") @@ -227,7 +227,7 @@ public class StationVideoTypeController extends BladeController { return R.data(stationVideoTypeService.getHikVisionStations()); } - @ApiLog + @GetMapping("/getFlvVideos") @ApiOperationSupport(order = 120) @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表") @@ -245,7 +245,7 @@ public class StationVideoTypeController extends BladeController { return R.data(page); } - @ApiLog + @GetMapping("/getFlvVideoConfig") @ApiOperationSupport(order = 120) @ApiOperation(value = "获取Flv配置列表", notes = "获取Flv配置列表") @@ -255,7 +255,7 @@ public class StationVideoTypeController extends BladeController { IPage page = videoConfigService.page(com.hnac.hzims.common.utils.Condition.getPage(query), queryWrapper); return R.data(page); } - @ApiLog + @PostMapping ("/updateFlvVideoConfig") @ApiOperationSupport(order = 120) @ApiOperation(value = "更新Flv配置列表", notes = "更新Flv配置列表") @@ -274,7 +274,7 @@ public class StationVideoTypeController extends BladeController { } return R.fail("更新视频配置失败"); } - @ApiLog + @PostMapping("/deleteFlvVideoConfig") @ApiOperationSupport(order = 120) @ApiOperation(value = "删除Flv配置列表", notes = "删除Flv配置列表") @@ -288,7 +288,7 @@ public class StationVideoTypeController extends BladeController { return R.fail("删除失败"); } - @ApiLog + @GetMapping("/getMonitorsByStation") @ApiOperationSupport(order = 130) @ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java index 1692820..68fbe08 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity; import com.hnac.hzims.operational.station.service.IStationVideoTypeService; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,7 +18,7 @@ public class StationVideoTypeClient implements IStationVideoTypeClient { private final IStationVideoTypeService stationVideoTypeService; - @ApiLog + @Override @PostMapping("/listByStationId") public List listByStationId(String stationId) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IControlUsersService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IControlUsersService.java index aa4bb33..9e61e56 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IControlUsersService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IControlUsersService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.operational.station.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.ControlUsersEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; /** * @author hx */ -public interface IControlUsersService extends BaseService { +public interface IControlUsersService extends IService { /** * 分页查询 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IHzimsAnalyzeModelStationService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IHzimsAnalyzeModelStationService.java index 06044e0..34ef776 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IHzimsAnalyzeModelStationService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IHzimsAnalyzeModelStationService.java @@ -1,8 +1,9 @@ package com.hnac.hzims.operational.station.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.HzimsAnalyzeModelStationEntity; -import org.springblade.core.mp.base.BaseService; + /** *

@@ -12,6 +13,6 @@ import org.springblade.core.mp.base.BaseService; * @author lx * @since 2021-09-28 */ -public interface IHzimsAnalyzeModelStationService extends BaseService { +public interface IHzimsAnalyzeModelStationService extends IService { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttrConfigService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttrConfigService.java index b327ee3..4bc8820 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttrConfigService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttrConfigService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.station.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.entity.StationAttrConfigEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.api.R; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; /** * @author 86187 */ -public interface IStationAttrConfigService extends BaseService { +public interface IStationAttrConfigService extends IService { /** * 更新 * @param req diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttributeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttributeService.java index 9f0bdff..0e101a7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttributeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationAttributeService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.operational.station.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.dto.StationAttributeDto; import com.hnac.hzims.operational.station.entity.StationAttributeEntity; import com.hnac.hzims.operational.station.vo.StationAttributeVo; import io.swagger.annotations.ApiParam; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.PathVariable; @@ -16,7 +17,7 @@ import java.util.Map; /** * @author hx */ -public interface IStationAttributeService extends BaseService { +public interface IStationAttributeService extends IService { /** * 显示某站点属性配置主页面 * @param attributeEntity diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationPushConfigService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationPushConfigService.java index 8b8cebd..c3277c4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationPushConfigService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationPushConfigService.java @@ -1,16 +1,17 @@ package com.hnac.hzims.operational.station.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.dto.StationPushConfigDTO; import com.hnac.hzims.operational.station.entity.StationPushConfigEntity; import com.hnac.hzims.operational.station.vo.StationPushConfigVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -public interface IStationPushConfigService extends BaseService { +public interface IStationPushConfigService extends IService { /** * 查询列表 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java index b54f579..a1e9d18 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.operational.station.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.main.vo.StationCountVo; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.vo.HomeMapStationVo; import com.hnac.hzims.operational.station.vo.StationAndDeptVo; import com.hnac.hzims.operational.station.vo.StationVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.system.entity.Dept; @@ -21,7 +22,7 @@ import java.util.Map; * UpdateCodeAspect中限定若第一个参数为List 则必为List * 若自定义update方法中未执行UpdateCodeAspect切点且修改了站点编码，则需自行处理其他包含站点编码业务模块） */ -public interface IStationService extends BaseService { +public interface IStationService extends IService { /** * 新建站点 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationUserService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationUserService.java index f653e05..7e132f1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationUserService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationUserService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.station.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.dto.StationUserDto; import com.hnac.hzims.operational.station.entity.StationUserEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -12,7 +13,7 @@ import java.util.List; /** * @author hx */ -public interface IStationUserService extends BaseService { +public interface IStationUserService extends IService { /** * 分页查询 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java index 3862dff..cccf075 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java @@ -2,6 +2,7 @@ package com.hnac.hzims.operational.station.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.station.dto.StationVideoTypeDTO; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity; @@ -11,7 +12,7 @@ import com.hnac.hzims.operational.station.vo.HikVideoAreaTreeVO; import com.hnac.hzims.operational.station.vo.StationVideoTypeVO; import com.hnac.hzims.operational.station.vo.VideoMonitorVO; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springframework.web.bind.annotation.RequestParam; @@ -19,7 +20,7 @@ import java.sql.Wrapper; import java.util.List; import java.util.Map; -public interface IStationVideoTypeService extends BaseService { +public interface IStationVideoTypeService extends IService { /** * 获取视频监测列表 * @return diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ControlUsersServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ControlUsersServiceImpl.java index 93ca84d..5683d1f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ControlUsersServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ControlUsersServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.operational.station.vo.StationVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.utils.CollectionUtil; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class ControlUsersServiceImpl extends BaseServiceImpl implements IControlUsersService { +public class ControlUsersServiceImpl extends ServiceImpl implements IControlUsersService { private final IStationService stationService; @@ -91,7 +91,7 @@ public class ControlUsersServiceImpl extends BaseServiceImpl implements IHzimsAnalyzeModelStationService { +public class HzimsAnalyzeModelStationServiceImpl extends ServiceImpl implements IHzimsAnalyzeModelStationService { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttrConfigServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttrConfigServiceImpl.java index ef3d12e..4c71f5f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttrConfigServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttrConfigServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.operational.station.service.IStationAttrConfigService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class StationAttrConfigServiceImpl extends BaseServiceImpl +public class StationAttrConfigServiceImpl extends ServiceImpl implements IStationAttrConfigService { @Override diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttributeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttributeServiceImpl.java index 5b6f614..e478562 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttributeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationAttributeServiceImpl.java @@ -25,7 +25,7 @@ import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -47,7 +47,7 @@ import java.util.stream.Stream; @Service @Slf4j @RequiredArgsConstructor -public class StationAttributeServiceImpl extends BaseServiceImpl implements IStationAttributeService { +public class StationAttributeServiceImpl extends ServiceImpl implements IStationAttributeService { private final UserAuthDataService userAuthDataService; private final IStationAttrConfigService stationAttrConfigService; @@ -200,7 +200,7 @@ public class StationAttributeServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.lambdaQuery().eq(StationAttributeEntity::getStationId, stationCode); List list = this.list(queryWrapper); if(CollectionUtil.isNotEmpty(list)) { - this.deleteLogic(list.stream().map(StationAttributeEntity::getId).collect(Collectors.toList())); + this.removeByIds(list.stream().map(StationAttributeEntity::getId).collect(Collectors.toList())); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationPushConfigServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationPushConfigServiceImpl.java index fb07bb7..b431227 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationPushConfigServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationPushConfigServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.operational.station.wrapper.StationPushConfigWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.utils.BeanUtil; @@ -33,7 +33,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class StationPushConfigServiceImpl extends BaseServiceImpl implements IStationPushConfigService { +public class StationPushConfigServiceImpl extends ServiceImpl implements IStationPushConfigService { @Override public List list(StationPushConfigDTO request) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index be9301e..6734b15 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -35,10 +35,10 @@ import com.hnac.hzinfo.sdk.v5.project.ProjectClient; import com.hnac.hzinfo.sdk.v5.project.dto.ProjectDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; -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.Query; import org.springblade.core.secure.BladeUser; @@ -65,12 +65,11 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class StationServiceImpl extends BaseServiceImpl implements IStationService { +public class StationServiceImpl extends ServiceImpl implements IStationService { private final ISysClient sysClient; private final IDeptClient deptClient; private final IUserClient userClient; private final ProjectClient projectClient; - private final BladeLogger logger; private final IQuestionClient questionClient; private final UserDeptService userDeptService; private final IStationAttributeService stationAttributeService; @@ -96,7 +95,7 @@ public class StationServiceImpl extends BaseServiceImpl idList) { + public boolean removeByIds(Collection idList) { if (CollectionUtils.isEmpty(idList)) { return false; } @@ -116,14 +115,14 @@ public class StationServiceImpl extends BaseServiceImpl deptResult = sysClient.getDept(stationEntity.getRefDept()); if (deptResult.isSuccess() && ObjectUtil.isNotEmpty(deptResult.getData())) { R projectResult = deptClient.deleteDeptById(stationEntity.getRefDept()); if (!projectResult.isSuccess()) { - logger.info("hzims-operational:station:removeStation", stationEntity.getRefDept() + "所属机构删除失败，报错信息为：" + projectResult.getMsg()); + log.info("hzims-operational:station:removeStation", stationEntity.getRefDept() + "所属机构删除失败，报错信息为：" + projectResult.getMsg()); } } } @@ -141,10 +140,10 @@ public class StationServiceImpl extends BaseServiceImpl list(StationEntity req, Query query) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() {{ - if (StringUtils.isNotBlank(req.getCode())) { + if (StringUtil.isNotBlank(req.getCode())) { like(StationEntity::getCode, "%".concat(req.getCode()).concat("%")); } - if (StringUtils.isNotBlank(req.getName())) { + if (StringUtil.isNotBlank(req.getName())) { like(StationEntity::getName, "%".concat(req.getName()).concat("%")); } if (ObjectUtil.isNotEmpty(req.getType())) { @@ -649,7 +648,7 @@ public class StationServiceImpl extends BaseServiceImpl luq = Wrappers.lambdaUpdate().set(StationEntity::getIsPushProject, true).eq(StationEntity::getId, req.getId()); return this.update(luq); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationUserServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationUserServiceImpl.java index 4549bd9..c05e72c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationUserServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationUserServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.operational.station.service.IStationUserService; import com.hnac.hzims.operational.station.wrapper.StationUserWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.utils.BeanUtil; @@ -23,7 +23,7 @@ import java.util.List; @Service @Slf4j @AllArgsConstructor -public class StationUserServiceImpl extends BaseServiceImpl implements IStationUserService { +public class StationUserServiceImpl extends ServiceImpl implements IStationUserService { @Override public IPage listPage(Query query, StationUserDto req) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java index ca4272b..81f458f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java @@ -28,8 +28,8 @@ import com.hnac.hzims.operational.station.vo.VideoMonitorVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; -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.Query; import org.springblade.core.tool.utils.*; @@ -49,10 +49,9 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class StationVideoTypeServiceImpl extends BaseServiceImpl implements IStationVideoTypeService { +public class StationVideoTypeServiceImpl extends ServiceImpl implements IStationVideoTypeService { private final HikPathConfiguration pathConfiguration; - private final BladeLogger logger; private final IHikVideoService hikVideoService; @Value("${url.video.login}") @@ -198,7 +197,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl monitorList = JSONArray.parseArray(response.body(), HikMonitorResp.class); - logger.info("HikVideo:monitor:info",JSON.toJSONString(monitorList)); + log.info("HikVideo:monitor:info",JSON.toJSONString(monitorList)); return monitorList.stream().collect(Collectors.groupingBy(HikMonitorResp::getDevice)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/HttpClientUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/HttpClientUtils.java index 95e9f7c..fa33806 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/HttpClientUtils.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/HttpClientUtils.java @@ -1,9 +1,10 @@ package com.hnac.hzims.operational.util; import com.alibaba.fastjson.JSONObject; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.operational.util.pojo.HttpResponse; import lombok.extern.log4j.Log4j2; -import org.apache.commons.lang.StringUtils; + import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java index 7ea0dbc..315c307 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/controller/AppVersionController.java @@ -10,9 +10,8 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import javax.validation.Valid; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.common.constant.CommonConstant; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -42,7 +41,7 @@ public class AppVersionController extends BladeController { /** * 详情 */ - @ApiLog + @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入app_version") @@ -54,7 +53,7 @@ public class AppVersionController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入app_version") @@ -101,7 +100,7 @@ public class AppVersionController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(appVersionService.deleteLogic(Func.toLongList(ids))); + return R.status(appVersionService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/IAppVersionService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/IAppVersionService.java index b4ca338..58f7f22 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/IAppVersionService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/IAppVersionService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.operational.version.service; -import org.springblade.core.mp.base.BaseService; + +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.version.entity.AppVersionEntity; /** @@ -8,6 +9,6 @@ import com.hnac.hzims.operational.version.entity.AppVersionEntity; * * @author Chill */ -public interface IAppVersionService extends BaseService { +public interface IAppVersionService extends IService { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/impl/AppVersionServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/impl/AppVersionServiceImpl.java index 46df1ec..9dfb640 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/impl/AppVersionServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/version/service/impl/AppVersionServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.version.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.operational.version.entity.AppVersionEntity; import com.hnac.hzims.operational.version.mapper.AppVersionMapper; import com.hnac.hzims.operational.version.service.IAppVersionService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class AppVersionServiceImpl extends BaseServiceImpl implements IAppVersionService { +public class AppVersionServiceImpl extends ServiceImpl implements IAppVersionService { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/IVideoPlatformService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/IVideoPlatformService.java index d1434b6..456cde1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/IVideoPlatformService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/IVideoPlatformService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.operational.video.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.video.dto.VideoPlaybackDTO; import com.hnac.hzims.operational.video.entity.VideoPlatformEntity; -import org.springblade.core.mp.base.BaseService; -public interface IVideoPlatformService extends BaseService { + +public interface IVideoPlatformService extends IService { /** * 查询视频回放 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/impl/VideoPlatformServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/impl/VideoPlatformServiceImpl.java index f636574..869de55 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/impl/VideoPlatformServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/video/service/impl/VideoPlatformServiceImpl.java @@ -5,11 +5,11 @@ import com.hnac.hzims.operational.video.dto.VideoPlaybackDTO; import com.hnac.hzims.operational.video.entity.VideoPlatformEntity; import com.hnac.hzims.operational.video.mapper.VideoPlatformMapper; import com.hnac.hzims.operational.video.service.IVideoPlatformService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service -public class VideoPlatformServiceImpl extends BaseServiceImpl implements IVideoPlatformService { +public class VideoPlatformServiceImpl extends ServiceImpl implements IVideoPlatformService { /** * 查询视频回放 diff --git a/hzims-service/operational/src/main/resources/application-dev.yml b/hzims-service/operational/src/main/resources/application-dev.yml deleted file mode 100644 index a4e0db4..0000000 --- a/hzims-service/operational/src/main/resources/application-dev.yml +++ /dev/null @@ -1,105 +0,0 @@ -#服务器端口 -server: - port: 8502 - -#数据源配置 -spring: - main: - allow-bean-definition-overriding: true - profiles: - active: dev - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - url: jdbc:mysql://175.6.40.67:5816/dev_hzims_operation?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 - redis: - ##redis 单机环境配置 - host: 175.6.40.67 - port: 5814 - password: - database: 0 - ssl: false - cloud: - config: - allow-override: true - override-none: true - override-system-properties: true - nacos: - discovery: - server-addr: 175.6.40.67:3301 - config: - server-addr: 175.6.40.67:3301 - inetutils: - preferred-networks: 10.8.0.6 - - -xxl: - job: - accessToken: '' - admin: - addresses: http://175.6.40.67:3579//xxl-job-admin - executor: - appname: hzims-operational - ip: 10.8.0.6 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 28501 - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - -hzims: - alert: - # 接收告警的websocket url - ws-url: wss://175.6.40.67:9300/api/hzinfo-data-socket/websocket/soe - pdf: - # pdf文件存储路径，请配置绝对路径 - #file-path: /data/inspect/pdf/file - file-path: D:/data/hzinfo/file # windows - # 消息推送存入redis的key值 - operation: - task: - templateCode: - maintenance: - taskDispose: aliyun-maintenace-task-dispose - # 消息推送code - jgPushCode: hzims-operational - -category: - id: 1384429129110360065 - -sanya: - one: 2000000101001001001 - tow: 2000000101001001002 - hoop: 2000000101001001003 - -defect: - # 超时自动甄别时间间隔：单位（小时） - discriminateDeadline: 1 - # 默认计划工时：单位（小时） - defaultPlanHoure: 8 - -blade: - data-scope: - enabled: false - lock: - enabled: true - address: redis://175.6.40.67:5814 - password: - database: 0 - ssl: false - diff --git a/hzims-service/operational/src/main/resources/application-prod.yml b/hzims-service/operational/src/main/resources/application-prod.yml deleted file mode 100644 index a96da50..0000000 --- a/hzims-service/operational/src/main/resources/application-prod.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} \ No newline at end of file diff --git a/hzims-service/operational/src/main/resources/application-test.yml b/hzims-service/operational/src/main/resources/application-test.yml deleted file mode 100644 index ac352b6..0000000 --- a/hzims-service/operational/src/main/resources/application-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} \ No newline at end of file diff --git a/hzims-service/operational/src/main/resources/application.yml b/hzims-service/operational/src/main/resources/application.yml deleted file mode 100644 index 4fe3093..0000000 --- a/hzims-service/operational/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:org/example/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - call-setters-on-nulls: true - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac diff --git a/hzims-service/operational/src/main/resources/template/template.yml b/hzims-service/operational/src/main/resources/template/template.yml new file mode 100644 index 0000000..eefa7e9 --- /dev/null +++ b/hzims-service/operational/src/main/resources/template/template.yml @@ -0,0 +1,194 @@ +#服务器端口 +server: + port: 8501 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +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_operation?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.operational,org.springbalde + +xxl: + job: + accessToken: '' + admin: + addresses: "http://${hzims.server.ip}:7009/xxl-job-admin" + executor: + appname: hzims-operational + ip: "${hzims.server.ip}" + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 7 + port: 28501 + +hzims: + # 视频配置地址随机码 + video: + random-code: qnrld30yto85cji5 + # 视频配置秘钥属性 + videoProperties: + appKey: 26486442 + videoHost: 140.210.208.111:443 + appSecret: tXBM9jsMqeM9yvEMS8qg + equipment: + emInfo: + code: hzims:equipment:emInfo:deviceCode.stationDeviceCode + emInfoList: hzims:equipment:emInfo:deviceCode.emInfoList + fdp: + redisData: hzims:equipment:fdp:fault.data.realIdAndValueList + greaterThan: 0.3 + lessThan: 0.9 + beEqualOrGreaterThan: 0.9 + alert: + # 接收告警的websocket url + ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/soe + config: + #接收遥测或遥信实时数据的websocket url + ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/data + level: + ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/alarm + pdf: + # pdf文件存储路径，请配置绝对路径 + #file-path: /data/inspect/pdf/file + file-path: D:/data/hzinfo/file # windows + duty: + file-path: /data/operation/file + operation: + construction: + save: + img: /data/hzims/operational/construction/save/img/ + access: + task-key: hzims:operation:access:task + alert: + saveDefectIsOpen: true + save: + area: + url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsArea + station: + url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsStation + defect: + repair: /data/hzims/operational/defect/repair/应急抢修单.docx + area: + report: hzims.operation.area.report + wind: + report: hzims.operation.wind.report + energy: + report: hzims.operation.energy.report + monitor: + station: hzims:operation:monitor:station + realId : hzims:operation:monitor:realId + region: + areaDutyInfoKey: hzims:operation:region:areaDutyInfoKey + deviceClassifyKey: hzims.operation.region.deviceClassifyKey + projectDepartmentId: 200000000000101 + projectDepartmentName: 智能运维事业部 + notInDept: 2000000000001010048,2000000000001010049,2000000000001010050 + tenantId: 200000 + #工单返回记录(暂存) + workOrder: + access: hzims:operation:workOrder.access + defect: hzims:operation:workOrder.defect + task: + # 消息推送存入redis的key值 + templateCode: + maintenance: + taskDispose: hzinfo:operation:maintenance:task + # 消息推送code + jgPushCode: ops-push + comprehensiveD: hzims:operation:comprehensiveD:real.time + realIdKey: hzims:operation:comprehensiveD:realIdKey.realData + lastDayRealIdKey: hzims:operation:comprehensiveD:lastDayRealIdKey.realData + realIdKeyGather: hzims:operation:comprehensiveD:realIdKeyGather.realData + homePage: + charge: + url: https://www.hznychh.cn/api/charging-manage/manage/external/provide?secretKey=f5aee9fe24e4d1d80eb7564414392bc3 + activePowerKey: hzims:operation:homePage:activePowerKey + jointRelayKey: hzims:operation:homePage:jointRelayKey + systemMonitoring: + hydropowerStation: + hisData: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisData:. + hisDataActivePower: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisDataActivePower:. + theDayHydrograph: hzims:operation:homePage:systemMonitoring:hydropowerStation:theDayHydrograph:. + yearGeneration: hzims:operation:homePage:systemMonitoring:hydropowerStation:yearGeneration.data + hisDataNew: hzims:operation:homePage:systemMonitoring:hydropowerStation:hisDataNew + theDayHydrographNew: hzims:operation:homePage:systemMonitoring:hydropowerStation:theDayHydrographNew + alarm: + # "0-默认", "1-系统", "2-告警", "3-故障", "4-用户操作", "5-遥测越限", "6-遥信变位", "7-注册信息", "8-信息提示", "9-设备巡检", "10-遥控操作", "11-遥测越限恢复","12-未定义","13-通讯中断","14-数据异常" + types: 3,2,5,13,14 + +category: + id: 1384429129110360065 + +feign: + hystrix: + enabled: true + +sanya: + one: 2000000000001010048 + tow: 2000000000001010049 + hoop: 2000000000001010050 + +defect: + # 超时自动甄别时间间隔：单位（小时） + discriminateDeadline: 1 + # 默认计划工时：单位（小时） + defaultPlanHoure: 8 + +blade: + data: + sdk: + enabled: true + url: http://192.168.60.29/api/hzinfo-data-config + ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler + appId: '1635888805125099521' + appSecret: f4b6a4dc696b36445d2e5d38bbab2417 + redisIp: 192.168.60.34 + redisPort: 3577 + password: L_MM&h=+Nm&p)U9sk.uH + maxKeys: 1000 + data-scope: + enabled: false + lock: + enabled: true + address: redis://192.168.60.34:3577 + password: + database: 0 + ssl: false +logging: + level: + com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient: NONE + +url: + video: + stationsPath: http://localhost:10001/stations + monitorsPath: http://localhost:10001/monitor + login: https://175.6.40.67:9300/hzApi/auth/mix/login?tenantId=200000&account=videoViewers&pwd=e10adc3949ba59abbe56e057f20f883e&grant_type=password&scope=all&type=account + water-out: + #工单受理 + orderCrtPackage: http://175.6.40.67:9021/api/water-out/orderCrt/package + orderCrtGrabPackage: http://175.6.40.67:9021/api/water-out/orderCrt/grabPackage diff --git a/hzims-service/operational/src/test/java/com/hnac/hzims/operational/OperationApplicationTest.java b/hzims-service/operational/src/test/java/com/hnac/hzims/operational/OperationApplicationTest.java index b3d1553..2f5af35 100644 --- a/hzims-service/operational/src/test/java/com/hnac/hzims/operational/OperationApplicationTest.java +++ b/hzims-service/operational/src/test/java/com/hnac/hzims/operational/OperationApplicationTest.java @@ -1,166 +1,166 @@ -package com.hnac.hzims.operational; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.google.common.collect.Lists; -import com.hnac.hzims.common.utils.DateUtil; -import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; -import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; -import com.hnac.hzims.operational.access.feign.OperAccessTaskClient; -import com.hnac.hzims.operational.defect.constants.DefectConstant; -import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; -import com.hnac.hzims.operational.defect.feign.IOperPhenomenonClient; -import com.hnac.hzims.operational.defect.service.IDefectCheckService; -import com.hnac.hzims.operational.feign.IAccessTaskClient; -import com.hnac.hzims.operational.main.scheduled.ScheduledCreateTask; -import com.hnac.hzims.operational.maintenance.scheduled.MaintenanceTaskCreateTask; -import com.hnac.hzims.operational.report.service.ITaskMonthService; -import com.hnac.hzims.operational.report.vo.StationReportAllVO; -import com.hnac.hzims.operational.station.dto.StationVideoTypeDTO; -import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity; -import com.hnac.hzims.operational.station.service.IStationVideoTypeService; -import com.hnac.hzims.operational.station.vo.StationVideoTypeVO; -import com.hnac.hzims.operational.station.vo.VideoMonitorVO; -import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; -import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; -import lombok.extern.slf4j.Slf4j; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springblade.core.mp.support.Query; -import org.springblade.core.test.BladeBootTest; -import org.springblade.core.test.BladeSpringRunner; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.SpringUtil; -import org.springblade.system.entity.Dept; -import org.springblade.system.feign.ISysClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.redis.core.RedisTemplate; - -import java.time.LocalDate; -import java.time.YearMonth; -import java.util.List; -import java.util.stream.Collectors; - -@RunWith(BladeSpringRunner.class) -@SpringBootTest(classes = OperationApplication.class,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@BladeBootTest(appName = "hzims-operational", profile = "test", enableLoader = true) -@Slf4j -public class OperationApplicationTest { - - @Autowired - private IAccessTaskClient accessTaskClient; - @Autowired - private IDefectCheckService defectCheckService; - @Autowired - private ITaskMonthService taskMonthService; - @Autowired - private ISysClient sysClient; - @Autowired - private IStationVideoTypeService stationVideoTypeService; - @Autowired - private IDangerSourceClient dangerSourceClient; - @Autowired - private IOperPhenomenonClient operPhenomenonClient; - - private List deptIdList; - private LocalDate startDate; - private LocalDate endDate; - - @Before - public void init() { - R> deptChild = sysClient.getDeptChild(2000000109L); - deptIdList = deptChild.getData().stream().map(Dept::getId).collect(Collectors.toList()); - startDate = DateUtil.getFirstDayByYearMonth(YearMonth.now().toString()); - endDate = DateUtil.getLastDayByYearMonth(YearMonth.now().toString()); - } - - @Test - public void loadDutyInfo(){ - MaintenanceTaskCreateTask schedule = SpringUtil.getBean(MaintenanceTaskCreateTask.class); - try { - schedule.execute(null); - } catch (Exception e) { - e.printStackTrace(); - } - log.info("执行任务完成！"); - } - - @Test - public void finishTask() { - Long taskId = 1547112025657929729L; - int actHours = 11; - OperAccessTaskDTO accessTaskDTO = new OperAccessTaskDTO(); - accessTaskDTO.setId(taskId); - accessTaskDTO.setActHours(actHours); - accessTaskClient.finishTask(accessTaskDTO); - } - - @Test - public void repairPreview() { - Long id = 1546297857192357889L; - //defectCheckService.preview(id); - } - - @Test - public void billing() { - Long taskId = 1547128459645603841L; - accessTaskClient.billing(taskId); - } - - @Test - public void getStationMonthReport() { - LocalDate startDate = LocalDate.of(2022,07,01); - taskMonthService.getStationMonthReport(startDate,null,"2000000109"); - } - - @Test - public void getVideoMonitor() { - List videoMonitor = stationVideoTypeService.getVideoMonitor(); - log.info(JSON.toJSONString(videoMonitor)); - } - - @Test - public void getStationVideoOrderBySort() { - StationVideoTypeDTO videoTypeDTO = new StationVideoTypeDTO(); - videoTypeDTO.setStationId("90240008"); - videoTypeDTO.setStatus(0); - Query query = new Query(); - query.setCurrent(1); - query.setSize(9); - IPage stationVideoOrderBySort = stationVideoTypeService.getStationVideoOrderBySort(videoTypeDTO, query); - log.info(JSON.toJSONString(stationVideoOrderBySort)); - } - - @Test - public void details() { - String[] ids = {"1397730214445895682","1397730928987525121","1400639072373899265","1420637374880182274","1468146850154553345"}; - List details = dangerSourceClient.details(ids); - log.info(JSON.toJSONString(details)); - } - - @Test - public void submit() { - OperPhenomenonEntity phenomenon = new OperPhenomenonEntity(); - phenomenon.setTypeCode("1"); - phenomenon.setName("1G压力表阀对象"); - phenomenon.setDiscriminateStatus("0"); - phenomenon.setFaultName("1G压力表阀对象-1G压力表阀-下-磁翻板液位计-智能巡检异常"); - phenomenon.setSourceCode("JX"); - phenomenon.setSourceId(1571697505073217538L); - phenomenon.setFinder(1380502803954315265L); - phenomenon.setDescripiton("机器人巡检事件 - 识别"); - phenomenon.setInitResult(null); - phenomenon.setTenantId("200000"); - phenomenon.setCreateUser(1380502803954315265L); - phenomenon.setCreateDept(20000001L); - R result = operPhenomenonClient.submit(phenomenon); - log.info("结果为：{}",JSON.toJSONString(result)); - } - - @Test - public void getVideoReviewerToken() { - log.info(stationVideoTypeService.getVideoReviewerToken()); - } -} +//package com.hnac.hzims.operational; +// +//import com.alibaba.fastjson.JSON; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.google.common.collect.Lists; +//import com.hnac.hzims.common.utils.DateUtil; +//import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; +//import com.hnac.hzims.operational.access.feign.IOperAccessTaskClient; +//import com.hnac.hzims.operational.access.feign.OperAccessTaskClient; +//import com.hnac.hzims.operational.defect.constants.DefectConstant; +//import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +//import com.hnac.hzims.operational.defect.feign.IOperPhenomenonClient; +//import com.hnac.hzims.operational.defect.service.IDefectCheckService; +//import com.hnac.hzims.operational.feign.IAccessTaskClient; +//import com.hnac.hzims.operational.main.scheduled.ScheduledCreateTask; +//import com.hnac.hzims.operational.maintenance.scheduled.MaintenanceTaskCreateTask; +//import com.hnac.hzims.operational.report.service.ITaskMonthService; +//import com.hnac.hzims.operational.report.vo.StationReportAllVO; +//import com.hnac.hzims.operational.station.dto.StationVideoTypeDTO; +//import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity; +//import com.hnac.hzims.operational.station.service.IStationVideoTypeService; +//import com.hnac.hzims.operational.station.vo.StationVideoTypeVO; +//import com.hnac.hzims.operational.station.vo.VideoMonitorVO; +//import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; +//import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; +//import lombok.extern.slf4j.Slf4j; +//import org.junit.Before; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.springblade.core.mp.support.Query; +//import org.springblade.core.test.BladeBootTest; +//import org.springblade.core.test.BladeSpringRunner; +//import org.springblade.core.tool.api.R; +//import org.springblade.core.tool.utils.SpringUtil; +//import org.springblade.system.entity.Dept; +//import org.springblade.system.feign.ISysClient; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.data.redis.core.RedisTemplate; +// +//import java.time.LocalDate; +//import java.time.YearMonth; +//import java.util.List; +//import java.util.stream.Collectors; +// +//@RunWith(BladeSpringRunner.class) +//@SpringBootTest(classes = OperationApplication.class,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +//@BladeBootTest(appName = "hzims-operational", profile = "test", enableLoader = true) +//@Slf4j +//public class OperationApplicationTest { +// +// @Autowired +// private IAccessTaskClient accessTaskClient; +// @Autowired +// private IDefectCheckService defectCheckService; +// @Autowired +// private ITaskMonthService taskMonthService; +// @Autowired +// private ISysClient sysClient; +// @Autowired +// private IStationVideoTypeService stationVideoTypeService; +// @Autowired +// private IDangerSourceClient dangerSourceClient; +// @Autowired +// private IOperPhenomenonClient operPhenomenonClient; +// +// private List deptIdList; +// private LocalDate startDate; +// private LocalDate endDate; +// +// @Before +// public void init() { +// R> deptChild = sysClient.getDeptChild(2000000109L); +// deptIdList = deptChild.getData().stream().map(Dept::getId).collect(Collectors.toList()); +// startDate = DateUtil.getFirstDayByYearMonth(YearMonth.now().toString()); +// endDate = DateUtil.getLastDayByYearMonth(YearMonth.now().toString()); +// } +// +// @Test +// public void loadDutyInfo(){ +// MaintenanceTaskCreateTask schedule = SpringUtil.getBean(MaintenanceTaskCreateTask.class); +// try { +// schedule.execute(null); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// log.info("执行任务完成！"); +// } +// +// @Test +// public void finishTask() { +// Long taskId = 1547112025657929729L; +// int actHours = 11; +// OperAccessTaskDTO accessTaskDTO = new OperAccessTaskDTO(); +// accessTaskDTO.setId(taskId); +// accessTaskDTO.setActHours(actHours); +// accessTaskClient.finishTask(accessTaskDTO); +// } +// +// @Test +// public void repairPreview() { +// Long id = 1546297857192357889L; +// //defectCheckService.preview(id); +// } +// +// @Test +// public void billing() { +// Long taskId = 1547128459645603841L; +// accessTaskClient.billing(taskId); +// } +// +// @Test +// public void getStationMonthReport() { +// LocalDate startDate = LocalDate.of(2022,07,01); +// taskMonthService.getStationMonthReport(startDate,null,"2000000109"); +// } +// +// @Test +// public void getVideoMonitor() { +// List videoMonitor = stationVideoTypeService.getVideoMonitor(); +// log.info(JSON.toJSONString(videoMonitor)); +// } +// +// @Test +// public void getStationVideoOrderBySort() { +// StationVideoTypeDTO videoTypeDTO = new StationVideoTypeDTO(); +// videoTypeDTO.setStationId("90240008"); +// videoTypeDTO.setStatus(0); +// Query query = new Query(); +// query.setCurrent(1); +// query.setSize(9); +// IPage stationVideoOrderBySort = stationVideoTypeService.getStationVideoOrderBySort(videoTypeDTO, query); +// log.info(JSON.toJSONString(stationVideoOrderBySort)); +// } +// +// @Test +// public void details() { +// String[] ids = {"1397730214445895682","1397730928987525121","1400639072373899265","1420637374880182274","1468146850154553345"}; +// List details = dangerSourceClient.details(ids); +// log.info(JSON.toJSONString(details)); +// } +// +// @Test +// public void submit() { +// OperPhenomenonEntity phenomenon = new OperPhenomenonEntity(); +// phenomenon.setTypeCode("1"); +// phenomenon.setName("1G压力表阀对象"); +// phenomenon.setDiscriminateStatus("0"); +// phenomenon.setFaultName("1G压力表阀对象-1G压力表阀-下-磁翻板液位计-智能巡检异常"); +// phenomenon.setSourceCode("JX"); +// phenomenon.setSourceId(1571697505073217538L); +// phenomenon.setFinder(1380502803954315265L); +// phenomenon.setDescripiton("机器人巡检事件 - 识别"); +// phenomenon.setInitResult(null); +// phenomenon.setTenantId("200000"); +// phenomenon.setCreateUser(1380502803954315265L); +// phenomenon.setCreateDept(20000001L); +// R result = operPhenomenonClient.submit(phenomenon); +// log.info("结果为：{}",JSON.toJSONString(result)); +// } +// +// @Test +// public void getVideoReviewerToken() { +// log.info(stationVideoTypeService.getVideoReviewerToken()); +// } +//} diff --git a/hzims-service/operational/src/test/java/com/hnac/hzims/operational/launcher/DemoTestLauncherServiceImpl.java b/hzims-service/operational/src/test/java/com/hnac/hzims/operational/launcher/DemoTestLauncherServiceImpl.java index 98fa494..373aff0 100644 --- a/hzims-service/operational/src/test/java/com/hnac/hzims/operational/launcher/DemoTestLauncherServiceImpl.java +++ b/hzims-service/operational/src/test/java/com/hnac/hzims/operational/launcher/DemoTestLauncherServiceImpl.java @@ -1,45 +1,45 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.hnac.hzims.operational.launcher; - -import org.springblade.core.auto.service.AutoService; -import org.springblade.core.launch.service.LauncherService; -import org.springframework.boot.builder.SpringApplicationBuilder; - -import java.util.Properties; - -/** - * 启动参数拓展 - * - * @author Chill - */ -@AutoService(LauncherService.class) -public class DemoTestLauncherServiceImpl implements LauncherService { - - @Override - public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { - Properties props = System.getProperties(); - //props.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:3301"); - //props.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:3301"); - //props.setProperty("spring.cloud.sentinel.transport.dashboard", LauncherConstant.SENTINEL_DEV_ADDR); - } - - @Override - public int getOrder() { - return 10; - } -} +///* +// * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. +// * +// * Redistribution and use in source and binary forms, with or without +// * modification, are permitted provided that the following conditions are met: +// * +// * Redistributions of source code must retain the above copyright notice, +// * this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// * notice, this list of conditions and the following disclaimer in the +// * documentation and/or other materials provided with the distribution. +// * Neither the name of the dreamlu.net developer nor the names of its +// * contributors may be used to endorse or promote products derived from +// * this software without specific prior written permission. +// * Author: Chill 庄骞 (smallchill@163.com) +// */ +//package com.hnac.hzims.operational.launcher; +// +//import org.springblade.core.auto.service.AutoService; +//import org.springblade.core.launch.service.LauncherService; +//import org.springframework.boot.builder.SpringApplicationBuilder; +// +//import java.util.Properties; +// +///** +// * 启动参数拓展 +// * +// * @author Chill +// */ +//@AutoService(LauncherService.class) +//public class DemoTestLauncherServiceImpl implements LauncherService { +// +// @Override +// public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { +// Properties props = System.getProperties(); +// //props.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:3301"); +// //props.setProperty("spring.cloud.nacos.config.server-addr", "http://175.6.40.67:3301"); +// //props.setProperty("spring.cloud.sentinel.transport.dashboard", LauncherConstant.SENTINEL_DEV_ADDR); +// } +// +// @Override +// public int getOrder() { +// return 10; +// } +//} diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index 487ee72..d31a804 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -55,7 +55,11 @@ com.hnac.hzims ticket-api - + + org.json + json + 20180130 + com.xuxueli xxl-job-core @@ -68,7 +72,7 @@ com.baomidou dynamic-datasource-spring-boot-starter - 2.5.6 + 3.5.0 org.apache.poi @@ -122,8 +126,21 @@ easypoi-spring-boot-starter ${easpoi.version} + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi + 3.17 + + + org.apache.poi + poi-ooxml + 3.15 + - hzims-${project.name}-${project.version} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java index cbe8cd6..560eda0 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java @@ -16,9 +16,13 @@ */ package com.hnac.hzims.safeproduct; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.druid.DruidDynamicDataSourceConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java index 98f6686..5223d67 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/AccidentController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -84,10 +83,10 @@ public class AccidentController extends BladeController { @Operate(label = "逻辑删除事故", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) public R remove(@PathVariable(value = "ids") @Valid String ids) { List idList = Func.toLongList(ids); - return R.status(accidentService.deleteLogic(idList)); + return R.status(accidentService.removeByIds(idList)); } - @ApiLog + @GetMapping("/pageList") @ApiOperation("分页查询") @ApiOperationSupport(order = 5) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckItemController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckItemController.java index 8fbb592..28d9bd0 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckItemController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckItemController.java @@ -76,7 +76,7 @@ public class CheckItemController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { -// checkItemService.deleteLogic(Func.toLongList(ids)) +// checkItemService.removeByIds(Func.toLongList(ids)) return R.status(checkItemService.remove(ids)); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckNoticeController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckNoticeController.java index cc020b2..c233774 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckNoticeController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckNoticeController.java @@ -61,7 +61,7 @@ public class CheckNoticeController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(CheckNoticeService.deleteLogic(Func.toLongList(ids))); + return R.status(CheckNoticeService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java index a08e7fa..5bb2457 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java @@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -44,7 +43,7 @@ public class EmergencyPlanController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(emergencyPlanService.deleteLogic(Func.toLongList(ids))); + return R.status(emergencyPlanService.removeByIds(Func.toLongList(ids))); } /** @@ -83,7 +82,7 @@ public class EmergencyPlanController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "安全管理",title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType = diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonAlarmInfoController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonAlarmInfoController.java index d9ae76e..a54fb11 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonAlarmInfoController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonAlarmInfoController.java @@ -128,6 +128,6 @@ public class ImsMonAlarmInfoController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(alarmInfoService.deleteLogic(Func.toLongList(ids))); + return R.status(alarmInfoService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java index 43f1230..6a58bb6 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java @@ -14,7 +14,6 @@ import com.hnac.hzinfo.log.annotation.Operate; import io.swagger.annotations.*; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -68,7 +67,7 @@ public class ImsMonCameraInfoController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入cameraInfo") @@ -172,6 +171,6 @@ public class ImsMonCameraInfoController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(cameraInfoService.deleteLogic(Func.toLongList(ids))); + return R.status(cameraInfoService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ReviewController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ReviewController.java index 193d86f..aad0a49 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ReviewController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ReviewController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -137,7 +136,7 @@ public class ReviewController extends BladeController { return R.data(vo); } - @ApiLog + @GetMapping("/listPage") @ApiOperation("分页查询") @ApiOperationSupport(order = 4) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java index 2d9a1d8..8acfb24 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java @@ -42,7 +42,7 @@ public class SafeEquipmentTrialController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") @Operate(label = "逻辑删除", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) 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))); } /** diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java index 3d31cab..f8750e9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java @@ -22,7 +22,6 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.apache.commons.io.FileUtils; 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.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -102,7 +101,7 @@ public class SafetyToolController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @OperationAnnotation(moduleName = "安全管理",title = "安全工具器",operatorType = OperatorType.MOBILE,businessType = diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java index 05f66eb..2d6fbf6 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.java @@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -49,7 +48,7 @@ public class SafetyToolTypeController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(safetyToolTypeService.deleteLogic(Func.toLongList(ids))); + return R.status(safetyToolTypeService.removeByIds(Func.toLongList(ids))); } /** @@ -101,7 +100,7 @@ public class SafetyToolTypeController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 60) @OperationAnnotation(moduleName = "安全管理",title = "安全工器具类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java index 50db8ef..698d781 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java @@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -47,7 +46,7 @@ public class SystemFileController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") @Operate(label = "逻辑删除", type = com.hnac.hzinfo.log.contants.BusinessType.DELETE, ignore = false) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(systemFileService.deleteLogic(Func.toLongList(ids))); + return R.status(systemFileService.removeByIds(Func.toLongList(ids))); } /** @@ -88,7 +87,7 @@ public class SystemFileController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：fTypeId,fileStatus,fileName") diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileTypeController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileTypeController.java index cbaa5ac..a0012e8 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileTypeController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileTypeController.java @@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.validation.BindingResult; @@ -93,7 +92,6 @@ public class SystemFileTypeController extends BladeController { /** * 获取树结构 */ - @ApiLog @GetMapping("/getTree") @ApiOperationSupport(order = 60) @ApiOperation(value = "获取树结构", notes = "查询条件：name") diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/controller/InnerDangerStartController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/controller/InnerDangerStartController.java index 574768c..8b29c73 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/controller/InnerDangerStartController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/controller/InnerDangerStartController.java @@ -12,7 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; @@ -35,7 +35,6 @@ public class InnerDangerStartController extends BladeController { /** * 隐患管理 */ - @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入hiddenDangerEntity") @@ -48,7 +47,6 @@ public class InnerDangerStartController extends BladeController { /** * 隐患管理 */ - @ApiLog @GetMapping("/detail") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入hiddenDangerEntity") @@ -61,7 +59,7 @@ public class InnerDangerStartController extends BladeController { /** * 隐患排查流程开启 */ - @ApiLog + @PostMapping("/startHiddenDanger") @ApiOperationSupport(order = 2) @ApiOperation(value = "开启隐患流程排查", notes = "传入hiddenDangerEntity") @@ -73,7 +71,7 @@ public class InnerDangerStartController extends BladeController { /** * 隐患基础页面 */ - @ApiLog + @GetMapping("/getHiddenDangerBase") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入hiddenDangerEntity") @@ -86,7 +84,7 @@ public class InnerDangerStartController extends BladeController { /** * 隐患排查页面 */ - @ApiLog + @GetMapping("/getHiddenDangerCheck") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入hiddenDangerEntity") @@ -99,7 +97,7 @@ public class InnerDangerStartController extends BladeController { /** * 隐患整改管理 */ - @ApiLog + @GetMapping("/getHiddenDangerRectifier") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入HiddenDangerRectifierVo") @@ -112,7 +110,7 @@ public class InnerDangerStartController extends BladeController { /** * 隐患验收管理 */ - @ApiLog + @GetMapping("/getHiddenDangerConclusion") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入HiddenDangerConclusionVo") diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/IInnerDangerFlowService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/IInnerDangerFlowService.java index 1c6c749..8298355 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/IInnerDangerFlowService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/IInnerDangerFlowService.java @@ -5,7 +5,7 @@ import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; import com.hnac.hzims.safeproduct.dto.InnerDangerDTO; import com.hnac.hzims.safeproduct.entity.InnerDangerEntity; import com.hnac.hzims.safeproduct.vo.*; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +14,7 @@ import java.util.List; /** * Created by ty 2023/9/18 10:16 */ -public interface IInnerDangerFlowService extends BaseService { +public interface IInnerDangerFlowService extends IService { IPage selectPage(InnerDangerEntity innerDangerEntity, Query query); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/impl/InnerDangerFlowServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/impl/InnerDangerFlowServiceImpl.java index 25e5a85..99daa47 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/impl/InnerDangerFlowServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/impl/InnerDangerFlowServiceImpl.java @@ -21,7 +21,7 @@ import com.hnac.hzims.safeproduct.flow.service.IInnerDangerFlowService; import com.hnac.hzims.safeproduct.vo.*; import org.apache.commons.collections4.CollectionUtils; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -46,7 +46,7 @@ import static com.hnac.hzims.safeproduct.Constants.HIDDEN_DANGER_CHECK; * Created by ty 2023/9/18 10:16 **/ @Service -public class InnerDangerFlowServiceImpl extends BaseServiceImpl implements IInnerDangerFlowService { +public class InnerDangerFlowServiceImpl extends ServiceImpl implements IInnerDangerFlowService { @Autowired private ISysClient sysClient; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/controller/DangerSourceController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/controller/DangerSourceController.java index 39e784f..078cb78 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/controller/DangerSourceController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/controller/DangerSourceController.java @@ -15,7 +15,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -45,7 +45,7 @@ public class DangerSourceController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(dangerSourceService.deleteLogic(Func.toLongList(ids))); + return R.status(dangerSourceService.removeByIds(Func.toLongList(ids))); } /** @@ -81,7 +81,7 @@ public class DangerSourceController extends BladeController { /** * 分页 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type") diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IDangerSourceService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IDangerSourceService.java index 96480f5..b963f2a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IDangerSourceService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IDangerSourceService.java @@ -10,7 +10,7 @@ import com.hnac.hzims.safeproduct.hazard.dto.HazardInstanceDTO; import com.hnac.hzims.safeproduct.hazard.vo.DangerSourceVO; import com.hnac.hzims.safeproduct.vo.DangerSourceReportVO; import com.hnac.hzims.safeproduct.vo.SourceVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.system.vo.CreateTableVO; @@ -25,7 +25,7 @@ import java.util.Map; * @author xiashandong * @created 2020/9/1 16:00 **/ -public interface IDangerSourceService extends BaseService { +public interface IDangerSourceService extends IService { R doSave(DangerSourceDTO req); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IHazardLibraryService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IHazardLibraryService.java index fcea334..2d4522a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IHazardLibraryService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IHazardLibraryService.java @@ -6,10 +6,10 @@ import com.hnac.hzims.common.utils.Condition; import com.hnac.hzims.safeproduct.hazard.dto.HazardLibraryDTO; import com.hnac.hzims.safeproduct.hazard.entity.HazardLibraryEntity; import com.hnac.hzims.safeproduct.hazard.vo.HazardLibraryVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; -public interface IHazardLibraryService extends BaseService { +public interface IHazardLibraryService extends IService { /** * 分页查询 diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/DangerSourceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/DangerSourceServiceImpl.java index 8e0418a..4a06937 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/DangerSourceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/DangerSourceServiceImpl.java @@ -42,7 +42,7 @@ import org.apache.commons.collections4.MapUtils; import org.apache.poi.ss.usermodel.BorderStyle; import org.springblade.core.excel.support.ExcelException; 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.Query; import org.springblade.core.tool.api.R; @@ -76,7 +76,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class DangerSourceServiceImpl extends BaseServiceImpl implements IDangerSourceService { +public class DangerSourceServiceImpl extends ServiceImpl implements IDangerSourceService { private final DangerSourceMapper dangerSourceMapper; private final DangerSourcePositionMapper dangerSourcePositionMapper; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/HazardLibraryServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/HazardLibraryServiceImpl.java index 7c404bd..1d6827d 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/HazardLibraryServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/impl/HazardLibraryServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.safeproduct.hazard.vo.HazardLibraryVO; import com.hnac.hzims.safeproduct.hazard.wrapper.HazardLibraryWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.utils.BeanUtil; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j @AllArgsConstructor -public class HazardLibraryServiceImpl extends BaseServiceImpl implements IHazardLibraryService { +public class HazardLibraryServiceImpl extends ServiceImpl implements IHazardLibraryService { @Override public IPage listPage(HazardLibraryDTO req, Query query) { diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java index 3868825..cc6cad7 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java @@ -11,6 +11,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFCell; + import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerPlanService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerPlanService.java index 1237e1b..a170152 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerPlanService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerPlanService.java @@ -3,9 +3,9 @@ package com.hnac.hzims.safeproduct.hiddenDanger.service; import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDPlanDTO; import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDPlanEntity; import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDPlanVO; -import org.springblade.core.mp.base.BaseService; -public interface IHiddenDangerPlanService extends BaseService { + +public interface IHiddenDangerPlanService extends IService { Boolean doSave(HDPlanDTO planDTO); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskCheckItemService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskCheckItemService.java index cc80e06..0ff0033 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskCheckItemService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskCheckItemService.java @@ -3,11 +3,11 @@ package com.hnac.hzims.safeproduct.hiddenDanger.service; import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDTaskCheckItemDTO; import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDTaskCheckItemEntity; import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDTaskCheckItemVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface IHiddenDangerTaskCheckItemService extends BaseService { +public interface IHiddenDangerTaskCheckItemService extends IService { List getList(HDTaskCheckItemDTO req); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskService.java index 2e5a821..30bcd5b 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskService.java @@ -5,7 +5,7 @@ import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDTaskDTO; import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDTaskEntity; import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDTaskVO; import com.hnac.hzims.safeproduct.statistic.vo.RiskDangerAccidentMonthCountVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; * @create: 2023-09-19 16:04 * @Version 4.0 **/ -public interface IHiddenDangerTaskService extends BaseService { +public interface IHiddenDangerTaskService extends IService { List list(HDTaskDTO req); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IPlanCheckItemService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IPlanCheckItemService.java index f98f7b2..3f533f9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IPlanCheckItemService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IPlanCheckItemService.java @@ -2,11 +2,11 @@ package com.hnac.hzims.safeproduct.hiddenDanger.service; import com.hnac.hzims.safeproduct.hiddenDanger.dto.PlanCheckItemDTO; import com.hnac.hzims.safeproduct.hiddenDanger.entity.PlanCheckItemEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; -public interface IPlanCheckItemService extends BaseService { +public interface IPlanCheckItemService extends IService { Boolean doSaveOrUpdateBatch(List itemList); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java index b0cd2fe..d351e8d 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDPlanVO; import com.hnac.hzims.safeproduct.hiddenDanger.wrapper.PlanCheckItemWrapper; import lombok.AllArgsConstructor; 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.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HiddenDangerPlanServiceImpl extends BaseServiceImpl implements IHiddenDangerPlanService { +public class HiddenDangerPlanServiceImpl extends ServiceImpl implements IHiddenDangerPlanService { private final IPlanCheckItemService planCheckItemService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskCheckItemService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskCheckItemService.java index 1204255..d8592a4 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskCheckItemService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskCheckItemService.java @@ -12,7 +12,7 @@ import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDTaskCheckItemVO; import com.hnac.hzims.safeproduct.hiddenDanger.wrapper.HDTaskCheckItemWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class HiddenDangerTaskCheckItemService extends BaseServiceImpl implements IHiddenDangerTaskCheckItemService { +public class HiddenDangerTaskCheckItemService extends IService implements IHiddenDangerTaskCheckItemService { @Override public List getList(HDTaskCheckItemDTO req) { diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskServiceImpl.java index a04de51..0c573ae 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskServiceImpl.java @@ -19,7 +19,7 @@ import com.hnac.hzims.safeproduct.statistic.vo.RiskDangerAccidentMonthCountVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HiddenDangerTaskServiceImpl extends BaseServiceImpl implements IHiddenDangerTaskService { +public class HiddenDangerTaskServiceImpl extends ServiceImpl implements IHiddenDangerTaskService { private final IHiddenDangerTaskCheckItemService taskCheckItemService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/PlanCheckItemServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/PlanCheckItemServiceImpl.java index 58a3c41..b0769e7 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/PlanCheckItemServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/PlanCheckItemServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.safeproduct.hiddenDanger.service.IPlanCheckItemService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; @@ -30,7 +30,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class PlanCheckItemServiceImpl extends BaseServiceImpl implements IPlanCheckItemService { +public class PlanCheckItemServiceImpl extends ServiceImpl implements IPlanCheckItemService { /** * 保存/编辑计划排查项 @@ -47,7 +47,7 @@ public class PlanCheckItemServiceImpl extends BaseServiceImpl removeIdList = this.listObjs(wrapper, Func::toLong); - this.deleteLogic(removeIdList); + this.removeByIds(removeIdList); return this.saveOrUpdateBatch(JSONArray.parseArray(JSON.toJSONString(itemList),PlanCheckItemEntity.class)); } } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/HazardLevelController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/HazardLevelController.java index 0167d66..cc63801 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/HazardLevelController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/HazardLevelController.java @@ -51,7 +51,7 @@ public class HazardLevelController { @ApiOperationSupport(order = 3) @ApiOperation(value = "逻辑删除", notes = "传入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))); } /** diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/CorrelationService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/CorrelationService.java index 0baadce..9b08493 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/CorrelationService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/CorrelationService.java @@ -3,12 +3,12 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.dto.CorrelationDTO; import com.hnac.hzims.safeproduct.risk.entity.Correlation; import com.hnac.hzims.safeproduct.risk.vo.CorrelationDetailsVo; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface CorrelationService extends BaseService { +public interface CorrelationService extends IService { boolean correlation(CorrelationDTO correlation); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimatePointService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimatePointService.java index f2f7923..5261212 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimatePointService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimatePointService.java @@ -1,11 +1,11 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.entity.RiskEstimatePoint; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface EstimatePointService extends BaseService { +public interface EstimatePointService extends IService { } \ No newline at end of file diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimateService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimateService.java index 2971a47..3c615d6 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimateService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimateService.java @@ -2,12 +2,12 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.entity.RiskEstimate; import com.hnac.hzims.safeproduct.risk.entity.RiskEstimatePoint; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface EstimateService extends BaseService { +public interface EstimateService extends IService { boolean saveEstimate(RiskEstimate entity); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardCategoryService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardCategoryService.java index 9bd5203..e9f7854 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardCategoryService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardCategoryService.java @@ -4,14 +4,14 @@ import com.hnac.hzims.safeproduct.risk.entity.HazardCategory; import com.hnac.hzims.safeproduct.risk.entity.HazardSource; import com.hnac.hzims.safeproduct.risk.vo.CategorySourceVo; import com.hnac.hzims.safeproduct.risk.vo.HazardDetailsVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface HazardCategoryService extends BaseService { +public interface HazardCategoryService extends IService { boolean saveDetail(HazardDetailsVo entity); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardEstimateService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardEstimateService.java index db31bf9..f60ef18 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardEstimateService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardEstimateService.java @@ -2,14 +2,14 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.entity.HazardEstimate; import com.hnac.hzims.safeproduct.risk.vo.ExportEstimateVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface HazardEstimateService extends BaseService { +public interface HazardEstimateService extends IService { List evaluationLevel(List estimates); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardLevelService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardLevelService.java index 01ce5bb..785af2a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardLevelService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardLevelService.java @@ -1,11 +1,11 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.entity.HazardLevel; -import org.springblade.core.mp.base.BaseService; + /** * @author ysj */ -public interface HazardLevelService extends BaseService { +public interface HazardLevelService extends IService { } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardSourceService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardSourceService.java index bf9b5e4..b07ae74 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardSourceService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardSourceService.java @@ -8,7 +8,7 @@ import com.hnac.hzims.safeproduct.risk.vo.HazardDetailsVo; import com.hnac.hzims.safeproduct.risk.vo.SourceVo; import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; /** * @author ysj */ -public interface HazardSourceService extends BaseService { +public interface HazardSourceService extends IService { IPage pageCondition(SourceVo entity, IPage page); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardTaskService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardTaskService.java index 0db7110..ce33304 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardTaskService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardTaskService.java @@ -9,14 +9,14 @@ import com.hnac.hzims.safeproduct.risk.vo.HazardTaskVo; import com.hnac.hzims.safeproduct.risk.vo.StationEstimateVo; import com.hnac.hzims.safeproduct.risk.vo.StationRiskLevelVo; import com.hnac.hzims.safeproduct.statistic.vo.RiskInnerVO; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author ysj */ -public interface HazardTaskService extends BaseService { +public interface HazardTaskService extends IService { boolean startProcess(HazardRiskProcessDTO process); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardWorkService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardWorkService.java index 545d6d3..2e5af1e 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardWorkService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardWorkService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.safeproduct.risk.entity.HazardWork; import com.hnac.hzims.safeproduct.risk.vo.HazardWorkVO; import com.hnac.hzims.safeproduct.risk.vo.PersonalCheckItemVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; /** * @author ysj */ -public interface HazardWorkService extends BaseService { +public interface HazardWorkService extends IService { boolean deleteBacth(List workIds); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/IRiskCheckService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/IRiskCheckService.java index d3c8996..50169e7 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/IRiskCheckService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/IRiskCheckService.java @@ -1,7 +1,7 @@ package com.hnac.hzims.safeproduct.risk.service; import com.hnac.hzims.safeproduct.risk.entity.RiskCheckEntity; -import org.springblade.core.mp.base.BaseService; + /** * @ClassName IRiskCheckService @@ -10,6 +10,6 @@ import org.springblade.core.mp.base.BaseService; * @create: 2023-09-19 09:34 * @Version 4.0 **/ -public interface IRiskCheckService extends BaseService { +public interface IRiskCheckService extends IService { } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/CorrelationServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/CorrelationServiceImpl.java index 5eb37f1..71cb262 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/CorrelationServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/CorrelationServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.safeproduct.risk.vo.CorrelationDetailsVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class CorrelationServiceImpl extends BaseServiceImpl implements CorrelationService { +public class CorrelationServiceImpl extends ServiceImpl implements CorrelationService { private final HazardSourceService sourceService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimatePointServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimatePointServiceImpl.java index cc958a1..4be8eef 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimatePointServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimatePointServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.safeproduct.risk.service.HazardLevelService; import com.hnac.hzims.vo.SafeCheckStatisticVO; import lombok.AllArgsConstructor; 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.ObjectUtil; import org.springblade.system.cache.DictCache; import org.springframework.stereotype.Service; @@ -25,6 +25,6 @@ import java.util.concurrent.CompletableFuture; @Service @AllArgsConstructor @Slf4j -public class EstimatePointServiceImpl extends BaseServiceImpl implements EstimatePointService { +public class EstimatePointServiceImpl extends ServiceImpl implements EstimatePointService { } \ No newline at end of file diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimateServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimateServiceImpl.java index 5d6759a..5b4cc6a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimateServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimateServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.safeproduct.risk.vo.CategorySourceVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictCache; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class EstimateServiceImpl extends BaseServiceImpl implements EstimateService { +public class EstimateServiceImpl extends ServiceImpl implements EstimateService { private final HazardLevelService levelService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardCategoryServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardCategoryServiceImpl.java index d2d271c..8c1dba2 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardCategoryServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardCategoryServiceImpl.java @@ -11,7 +11,7 @@ import com.hnac.hzims.safeproduct.risk.vo.HazardDetailsVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HazardCategoryServiceImpl extends BaseServiceImpl implements HazardCategoryService { +public class HazardCategoryServiceImpl extends ServiceImpl implements HazardCategoryService { private final HazardSourceService sourceService; @@ -117,7 +117,7 @@ public class HazardCategoryServiceImpl extends BaseServiceImpllambdaQuery() + return super.removeByIds(ids) && sourceService.remove(Wrappers.lambdaQuery() .in(HazardSource::getCategoryId,ids)); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardEstimateServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardEstimateServiceImpl.java index 10aaba6..c4f9021 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardEstimateServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardEstimateServiceImpl.java @@ -10,7 +10,7 @@ import com.hnac.hzims.safeproduct.risk.service.HazardLevelService; import com.hnac.hzims.safeproduct.risk.vo.ExportEstimateVo; import lombok.AllArgsConstructor; 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.ObjectUtil; import org.springblade.system.cache.DictCache; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HazardEstimateServiceImpl extends BaseServiceImpl implements HazardEstimateService { +public class HazardEstimateServiceImpl extends ServiceImpl implements HazardEstimateService { private final HazardLevelService levelService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardLevelServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardLevelServiceImpl.java index dc5a50d..7f0ec7e 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardLevelServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardLevelServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.safeproduct.risk.mapper.HazardLevelMapper; import com.hnac.hzims.safeproduct.risk.service.HazardLevelService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor @Slf4j -public class HazardLevelServiceImpl extends BaseServiceImpl implements HazardLevelService { +public class HazardLevelServiceImpl extends ServiceImpl implements HazardLevelService { } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardSourceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardSourceServiceImpl.java index 604c2e3..268ef3a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardSourceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardSourceServiceImpl.java @@ -15,7 +15,7 @@ import com.hnac.hzims.safeproduct.risk.vo.SourceVo; import com.hnac.hzims.safeproduct.risk.wrapper.HazardSourceWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.CollectionUtil; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HazardSourceServiceImpl extends BaseServiceImpl implements HazardSourceService { +public class HazardSourceServiceImpl extends ServiceImpl implements HazardSourceService { private final CorrelationMapper correlationMapper; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardTaskServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardTaskServiceImpl.java index 351f569..0a4bcbc 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardTaskServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardTaskServiceImpl.java @@ -18,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.flow.core.entity.BladeFlow; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; @Slf4j @AllArgsConstructor @Service -public class HazardTaskServiceImpl extends BaseServiceImpl implements HazardTaskService { +public class HazardTaskServiceImpl extends ServiceImpl implements HazardTaskService { private final HazardWorkService workService; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardWorkServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardWorkServiceImpl.java index 03688b7..db26f86 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardWorkServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardWorkServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzims.safeproduct.risk.vo.PersonalCheckItemVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Slf4j -public class HazardWorkServiceImpl extends BaseServiceImpl implements HazardWorkService { +public class HazardWorkServiceImpl extends ServiceImpl implements HazardWorkService { private final CorrelationService correlationService; private final HazardSourceService hazardSourceService; @@ -58,7 +58,7 @@ public class HazardWorkServiceImpl extends BaseServiceImpllambdaQuery().in(Correlation::getWorkId,workIds)); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/RiskCheckServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/RiskCheckServiceImpl.java index b333425..574088d 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/RiskCheckServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/RiskCheckServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.safeproduct.risk.mapper.RiskCheckMapper; import com.hnac.hzims.safeproduct.risk.service.IRiskCheckService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -18,6 +18,6 @@ import org.springframework.stereotype.Service; @Slf4j @AllArgsConstructor @Service -public class RiskCheckServiceImpl extends BaseServiceImpl implements IRiskCheckService { +public class RiskCheckServiceImpl extends ServiceImpl implements IRiskCheckService { } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/controller/RiskHazardsScreeningController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/controller/RiskHazardsScreeningController.java index 59465e3..9f248cc 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/controller/RiskHazardsScreeningController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/controller/RiskHazardsScreeningController.java @@ -105,7 +105,7 @@ public class RiskHazardsScreeningController extends BladeController implements C @ApiOperationSupport(order = 6) @ApiOperation(value = "逻辑删除", notes = "ids") public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = riskHazardsScreeningService.deleteLogic(Func.toLongList(ids)); + boolean temp = riskHazardsScreeningService.removeByIds(Func.toLongList(ids)); return R.status(temp); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/IRiskHazardsScreeningService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/IRiskHazardsScreeningService.java index ac2b118..7d0defb 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/IRiskHazardsScreeningService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/IRiskHazardsScreeningService.java @@ -2,12 +2,12 @@ package com.hnac.hzims.safeproduct.riskhazards.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.safeproduct.riskhazards.entity.RiskHazardsScreening; -import org.springblade.core.mp.base.BaseService; + import java.util.List; import java.util.Map; -public interface IRiskHazardsScreeningService extends BaseService { +public interface IRiskHazardsScreeningService extends IService { List> countMap(LambdaQueryWrapper wrapper); List> countByType(LambdaQueryWrapper wrapper); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/impl/RiskHazardsScreeningServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/impl/RiskHazardsScreeningServiceImpl.java index 0b3b514..209c203 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/impl/RiskHazardsScreeningServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/impl/RiskHazardsScreeningServiceImpl.java @@ -6,14 +6,14 @@ import com.hnac.hzims.safeproduct.riskhazards.mapper.RiskHazardsScreeningMapper; import com.hnac.hzims.safeproduct.riskhazards.service.IRiskHazardsScreeningService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.system.cache.DictCache; import org.springframework.stereotype.Service; import java.util.*; @Service -public class RiskHazardsScreeningServiceImpl extends BaseServiceImpl implements IRiskHazardsScreeningService { +public class RiskHazardsScreeningServiceImpl extends ServiceImpl implements IRiskHazardsScreeningService { @Override public List> countMap(LambdaQueryWrapper wrapper) { List list= this.list(wrapper); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafetyToolRecheckBeforeTask.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafetyToolRecheckBeforeTask.java index c6ea948..43304cc 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafetyToolRecheckBeforeTask.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/scheduled/SafetyToolRecheckBeforeTask.java @@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.scheduled; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.safeproduct.entity.SafetyToolTypeEntity; import com.hnac.hzims.safeproduct.entity.SafetyToolTypeUserEntity; import com.hnac.hzims.safeproduct.enums.MsgSendTypeEnum; @@ -12,7 +13,6 @@ import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.map.HashedMap; -import org.apache.commons.lang.StringUtils; import org.springblade.core.sms.model.SmsResponse; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewService.java index 28ed7d8..bfe48cf 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewService.java @@ -2,7 +2,7 @@ package com.hnac.hzims.safeproduct.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.safeproduct.entity.ReviewEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java index df1e142..408e7df 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java @@ -9,6 +9,7 @@ import com.hnac.hzims.safeproduct.entity.CarAnnualInspectionEntity; import com.hnac.hzims.safeproduct.entity.CarEntity; import com.hnac.hzims.safeproduct.enums.CarAnnualInspectionStatusEnum; import com.hnac.hzims.safeproduct.mapper.CarAnnualInspectionMapper; +import com.hnac.hzims.safeproduct.mapper.CarMapper; import com.hnac.hzims.safeproduct.service.ICarAnnualInspectionService; import com.hnac.hzims.safeproduct.service.ICarService; import com.hnac.hzims.safeproduct.utils.BaseUtil; @@ -34,7 +35,7 @@ import java.util.stream.Collectors; public class CarAnnualInspectionServiceImpl extends ServiceImpl implements ICarAnnualInspectionService { @Autowired - ICarService carService; + CarMapper carMapper; /** * 新增年检记录 @@ -53,13 +54,16 @@ public class CarAnnualInspectionServiceImpl extends ServiceImpl 0) { + return true; + } } } return false; @@ -74,11 +78,14 @@ public class CarAnnualInspectionServiceImpl extends ServiceImpl 0) { + return true; + } } } return false; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java index 01dc3fe..0fc4f7e 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java @@ -9,11 +9,13 @@ import com.hnac.hzims.safeproduct.entity.CarEntity; import com.hnac.hzims.safeproduct.entity.CarInsuranceEntity; import com.hnac.hzims.safeproduct.enums.CarInsuranceStatusEnum; import com.hnac.hzims.safeproduct.mapper.CarInsuranceMapper; +import com.hnac.hzims.safeproduct.mapper.CarMapper; import com.hnac.hzims.safeproduct.service.ICarInsuranceService; import com.hnac.hzims.safeproduct.service.ICarService; import com.hnac.hzims.safeproduct.utils.BaseUtil; import com.hnac.hzims.safeproduct.vo.CarInsurancePageVO; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -33,7 +35,7 @@ import java.util.stream.Collectors; public class CarInsuranceServiceImpl extends ServiceImpl implements ICarInsuranceService { @Autowired - ICarService carService; + CarMapper carMapper; /** * 新增车保记录 @@ -51,13 +53,17 @@ public class CarInsuranceServiceImpl extends ServiceImpl 0) { + return true; + } + } } return false; @@ -71,11 +77,14 @@ public class CarInsuranceServiceImpl extends ServiceImpl 0) { + return true; + } } } return false; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java index b6d0f88..f42c988 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java @@ -14,6 +14,7 @@ import com.hnac.hzims.safeproduct.entity.CarMaintenanceEntity; import com.hnac.hzims.safeproduct.enums.CarMaintenanceStatusEnum; import com.hnac.hzims.safeproduct.enums.CarMaintenanceTypeEnum; import com.hnac.hzims.safeproduct.mapper.CarMaintenanceMapper; +import com.hnac.hzims.safeproduct.mapper.CarMapper; import com.hnac.hzims.safeproduct.service.ICarMaintenanceService; import com.hnac.hzims.safeproduct.service.ICarService; import com.hnac.hzims.safeproduct.utils.BaseUtil; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; public class CarMaintenanceServiceImpl extends ServiceImpl implements ICarMaintenanceService { @Autowired - ICarService carService; + CarMapper carMapper; @Value("${hzims.car.savePath}") private String savePath; @@ -103,12 +104,15 @@ public class CarMaintenanceServiceImpl extends ServiceImpl0){ + return R.success("操作成功"); + } } return R.fail("操作失败"); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckNoticeServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckNoticeServiceImpl.java index f61cd79..9c42947 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckNoticeServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckNoticeServiceImpl.java @@ -18,7 +18,6 @@ import com.hnac.hzims.safeproduct.wrapper.CheckNoticeWrapper; import com.hnac.hzinfo.core.push.enums.PushAudienceType; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java index d77581c..8899753 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java @@ -15,7 +15,7 @@ import com.hnac.hzims.safeproduct.vo.SystemFileVO; import com.hnac.hzims.safeproduct.wrapper.SystemFileWrapper; import lombok.RequiredArgsConstructor; 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.Query; import org.springblade.core.tool.api.R; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java index d5d3db5..bf4192f 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java @@ -2,16 +2,10 @@ package com.hnac.hzims.safeproduct.template.serviceimpl; import com.alibaba.fastjson.JSON; import com.hnac.hzims.message.dto.PlanMsgRecordDto; -import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.safeproduct.template.abstracts.TemplateAbstractService; -import com.qiniu.util.Json; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; diff --git a/hzims-service/safeproduct/src/main/resources/template/template.yml b/hzims-service/safeproduct/src/main/resources/template/template.yml index a02c903..a23c283 100644 --- a/hzims-service/safeproduct/src/main/resources/template/template.yml +++ b/hzims-service/safeproduct/src/main/resources/template/template.yml @@ -12,20 +12,20 @@ oss: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" - username: "${hzinfo.db.busines.username}" - password: "${hzinfo.db.busines.password}" - slave: - url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" - username: "${hzinfo.db.busines.username}" - password: "${hzinfo.db.busines.password}" + exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + dynamic: + primary: hzims + datasource: + hzims: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + #mybatis-plus配置 mybatis-plus: diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeDetailController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeDetailController.java index c159e2a..543d64c 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeDetailController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeDetailController.java @@ -81,7 +81,7 @@ public class HzimsSpChangeDetailController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spChangeDetailService.deleteLogic(Func.toLongList(ids))); + return R.status(spChangeDetailService.removeByIds(Func.toLongList(ids))); }*/ } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeRecController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeRecController.java index 7116021..da7999b 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeRecController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpChangeRecController.java @@ -93,7 +93,7 @@ public class HzimsSpChangeRecController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spChangeRecService.deleteLogic(Func.toLongList(ids))); + return R.status(spChangeRecService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpFileController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpFileController.java index f909dff..a35eb87 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpFileController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpFileController.java @@ -91,7 +91,7 @@ public class HzimsSpFileController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spFileService.deleteLogic(Func.toLongList(ids))); + return R.status(spFileService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpProviderController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpProviderController.java index e06866e..18c004a 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpProviderController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpProviderController.java @@ -107,7 +107,7 @@ public class HzimsSpProviderController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spProviderService.deleteLogic(Func.toLongList(ids))); + return R.status(spProviderService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpRelevanceFileController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpRelevanceFileController.java index 6bdb69a..48e2d7b 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpRelevanceFileController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpRelevanceFileController.java @@ -91,7 +91,7 @@ public class HzimsSpRelevanceFileController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spRelevanceFileService.deleteLogic(Func.toLongList(ids))); + return R.status(spRelevanceFileService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpTypeController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpTypeController.java index e56573e..f0cd420 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpTypeController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpTypeController.java @@ -110,7 +110,7 @@ public class HzimsSpTypeController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spTypeService.deleteLogic(Func.toLongList(ids))); + return R.status(spTypeService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWareRelatedController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWareRelatedController.java index 3c6e9e1..ff0dfb1 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWareRelatedController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWareRelatedController.java @@ -81,7 +81,7 @@ public class HzimsSpWareRelatedController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spWareRelatedService.deleteLogic(Func.toLongList(ids))); + return R.status(spWareRelatedService.removeByIds(Func.toLongList(ids))); }*/ } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWarehouseController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWarehouseController.java index d5632e2..9c7d874 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWarehouseController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSpWarehouseController.java @@ -102,7 +102,7 @@ public class HzimsSpWarehouseController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(spWarehouseService.deleteLogic(Func.toLongList(ids))); + return R.status(spWarehouseService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSparePartsController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSparePartsController.java index 28e6bd0..756ad52 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSparePartsController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/HzimsSparePartsController.java @@ -93,7 +93,7 @@ public class HzimsSparePartsController extends BladeController { @ApiOperationSupport(order = 12) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(sparePartsService.deleteLogic(Func.toLongList(ids))); + return R.status(sparePartsService.removeByIds(Func.toLongList(ids))); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/NoticeController.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/NoticeController.java index b4f39e3..e590821 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/NoticeController.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/controller/NoticeController.java @@ -109,7 +109,7 @@ public class NoticeController extends BladeController implements CacheNames { @ApiOperationSupport(order = 6) @ApiOperation(value = "逻辑删除", notes = "传入notice") public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { - boolean temp = noticeService.deleteLogic(Func.toLongList(ids)); + boolean temp = noticeService.removeByIds(Func.toLongList(ids)); return R.status(temp); } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IDynamicService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IDynamicService.java index cf74947..1411bd5 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IDynamicService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IDynamicService.java @@ -17,7 +17,7 @@ package com.hnac.hzims.spare.service; import com.hnac.hzims.spare.entity.Notice; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -26,7 +26,7 @@ import java.util.List; * * @author Chill */ -public interface IDynamicService extends BaseService { +public interface IDynamicService extends IService { /** * master数据源的列表 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpChangeRecService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpChangeRecService.java index e749905..b383f3b 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpChangeRecService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpChangeRecService.java @@ -2,14 +2,14 @@ package com.hnac.hzims.spare.service; import com.hnac.hzims.spare.dto.HzimsSpChangeRecDTO; import com.hnac.hzims.spare.entity.HzimsSpChangeRecEntity; -import org.springblade.core.mp.base.BaseService; + /** * 备品备件出入库 服务类 * * @author Chill */ -public interface IHzimsSpChangeRecService extends BaseService { +public interface IHzimsSpChangeRecService extends IService { /** * 物理删除 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpFileService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpFileService.java index 8043a22..73ca078 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpFileService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpFileService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.spare.entity.HzimsSpFileEntity; /** @@ -8,6 +8,6 @@ import com.hnac.hzims.spare.entity.HzimsSpFileEntity; * * @author Chill */ -public interface IHzimsSpFileService extends BaseService { +public interface IHzimsSpFileService extends IService { } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpProviderService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpProviderService.java index 8685216..2570626 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpProviderService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpProviderService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.spare.entity.HzimsSpProviderEntity; /** @@ -8,7 +8,7 @@ import com.hnac.hzims.spare.entity.HzimsSpProviderEntity; * * @author Chill */ -public interface IHzimsSpProviderService extends BaseService { +public interface IHzimsSpProviderService extends IService { /** * 物理删除 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpRelevanceFileService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpRelevanceFileService.java index d5b1300..3448af5 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpRelevanceFileService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpRelevanceFileService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.spare.entity.HzimsSpRelevanceFileEntity; /** @@ -8,6 +8,6 @@ import com.hnac.hzims.spare.entity.HzimsSpRelevanceFileEntity; * * @author Chill */ -public interface IHzimsSpRelevanceFileService extends BaseService { +public interface IHzimsSpRelevanceFileService extends IService { } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpTypeService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpTypeService.java index 7a4322f..81c442c 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpTypeService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpTypeService.java @@ -2,7 +2,7 @@ package com.hnac.hzims.spare.service; import com.hnac.hzims.spare.dto.HzimsSpTypeDTO; import com.hnac.hzims.spare.entity.HzimsSpTypeEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * * @author Chill */ -public interface IHzimsSpTypeService extends BaseService { +public interface IHzimsSpTypeService extends IService { /** * 重写新增或者修改接口，增加code为空，设置编码 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpWarehouseService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpWarehouseService.java index 79b56f1..d18bd51 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpWarehouseService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSpWarehouseService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.spare.entity.HzimsSpWarehouseEntity; /** @@ -8,7 +8,7 @@ import com.hnac.hzims.spare.entity.HzimsSpWarehouseEntity; * * @author Chill */ -public interface IHzimsSpWarehouseService extends BaseService { +public interface IHzimsSpWarehouseService extends IService { /** * 物理删除 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSparePartsService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSparePartsService.java index 7e9ba59..f4906ac 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSparePartsService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/IHzimsSparePartsService.java @@ -3,7 +3,7 @@ package com.hnac.hzims.spare.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.spare.dto.HzimsSpareCountDTO; import com.hnac.hzims.spare.entity.HzimsSparePartsEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -14,7 +14,7 @@ import java.util.List; * * @author Chill */ -public interface IHzimsSparePartsService extends BaseService { +public interface IHzimsSparePartsService extends IService { /** * 重写新增或者修改接口，增加code为空，设置编码 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/INoticeService.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/INoticeService.java index 34023fa..15ee8fc 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/INoticeService.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/INoticeService.java @@ -18,14 +18,14 @@ package com.hnac.hzims.spare.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.spare.entity.Notice; -import org.springblade.core.mp.base.BaseService; + /** * 服务类 * * @author Chill */ -public interface INoticeService extends BaseService { +public interface INoticeService extends IService { /** * 自定义分页 diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/DynamicServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/DynamicServiceImpl.java index a49af22..cbecdcd 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/DynamicServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/DynamicServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.spare.entity.Notice; import com.hnac.hzims.spare.mapper.NoticeMapper; import com.hnac.hzims.spare.service.IDynamicService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; * @author Chill */ @Service -public class DynamicServiceImpl extends BaseServiceImpl implements IDynamicService { +public class DynamicServiceImpl extends ServiceImpl implements IDynamicService { @Override public List masterList() { diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpChangeRecServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpChangeRecServiceImpl.java index 7d035a9..a7de03d 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpChangeRecServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpChangeRecServiceImpl.java @@ -13,7 +13,7 @@ import com.hnac.hzims.spare.service.IHzimsSpWareRelatedService; import com.hnac.hzims.spare.service.IHzimsSparePartsService; import com.hnac.hzims.spare.utils.CodeDateRandomUtils; import com.hnac.hzinfo.common.utils.StringUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ import java.util.List; * @author Chill */ @Service -public class HzimsSpChangeRecServiceImpl extends BaseServiceImpl implements IHzimsSpChangeRecService { +public class HzimsSpChangeRecServiceImpl extends ServiceImpl implements IHzimsSpChangeRecService { private static final String PURC_PREFIX_CODE = "PURC"; private static final String IN_PREFIX_CODE = "IN"; private static final String OUT_PREFIX_CODE = "OUT"; diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpFileServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpFileServiceImpl.java index 5c557f9..b8c33d1 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpFileServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpFileServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.HzimsSpFileEntity; import com.hnac.hzims.spare.mapper.HzimsSpFileMapper; import com.hnac.hzims.spare.service.IHzimsSpFileService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class HzimsSpFileServiceImpl extends BaseServiceImpl implements IHzimsSpFileService { +public class HzimsSpFileServiceImpl extends ServiceImpl implements IHzimsSpFileService { } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpProviderServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpProviderServiceImpl.java index 2497c5e..846e7a6 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpProviderServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpProviderServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.HzimsSpProviderEntity; import com.hnac.hzims.spare.mapper.HzimsSpProviderMapper; import com.hnac.hzims.spare.service.IHzimsSpProviderService; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class HzimsSpProviderServiceImpl extends BaseServiceImpl implements IHzimsSpProviderService { +public class HzimsSpProviderServiceImpl extends ServiceImpl implements IHzimsSpProviderService { @Override public boolean removeById(Long id){ diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpRelevanceFileServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpRelevanceFileServiceImpl.java index c04672b..9d09856 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpRelevanceFileServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpRelevanceFileServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.HzimsSpRelevanceFileEntity; import com.hnac.hzims.spare.mapper.HzimsSpRelevanceFileMapper; import com.hnac.hzims.spare.service.IHzimsSpRelevanceFileService; @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class HzimsSpRelevanceFileServiceImpl extends BaseServiceImpl implements IHzimsSpRelevanceFileService { +public class HzimsSpRelevanceFileServiceImpl extends ServiceImpl implements IHzimsSpRelevanceFileService { } diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpTypeServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpTypeServiceImpl.java index 90538fc..b806dbe 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpTypeServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpTypeServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.spare.service.IHzimsSpTypeService; import com.hnac.hzims.spare.utils.CodeDateRandomUtils; import com.hnac.hzims.spare.utils.TreeUtil; import com.hnac.hzinfo.common.utils.StringUtils; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.Date; @@ -19,7 +19,7 @@ import java.util.List; * @author Chill */ @Service -public class HzimsSpTypeServiceImpl extends BaseServiceImpl implements IHzimsSpTypeService { +public class HzimsSpTypeServiceImpl extends ServiceImpl implements IHzimsSpTypeService { private static final String PREFIX_CODE = "SPTYPE"; @Override diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpWarehouseServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpWarehouseServiceImpl.java index 7b210b3..b4652cf 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpWarehouseServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSpWarehouseServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.service.impl; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.HzimsSpWarehouseEntity; import com.hnac.hzims.spare.mapper.HzimsSpWarehouseMapper; import com.hnac.hzims.spare.service.IHzimsSpWarehouseService; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class HzimsSpWarehouseServiceImpl extends BaseServiceImpl implements IHzimsSpWarehouseService { +public class HzimsSpWarehouseServiceImpl extends ServiceImpl implements IHzimsSpWarehouseService { @Override public boolean removeById(Long id){ diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSparePartsServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSparePartsServiceImpl.java index 294b035..6e83e58 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSparePartsServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/HzimsSparePartsServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.spare.mapper.HzimsSparePartsMapper; import com.hnac.hzims.spare.service.IHzimsSparePartsService; import com.hnac.hzims.spare.utils.CodeDateRandomUtils; import com.hnac.hzinfo.common.utils.StringUtils; -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.Query; import org.springblade.core.tool.api.R; @@ -24,7 +24,7 @@ import java.util.*; * @author Chill */ @Service -public class HzimsSparePartsServiceImpl extends BaseServiceImpl implements IHzimsSparePartsService { +public class HzimsSparePartsServiceImpl extends ServiceImpl implements IHzimsSparePartsService { private static final String PREFIX_CODE = "SP"; @Override diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/NoticeServiceImpl.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/NoticeServiceImpl.java index a3846b3..2fdb539 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/NoticeServiceImpl.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/service/impl/NoticeServiceImpl.java @@ -19,7 +19,7 @@ package com.hnac.hzims.spare.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.spare.mapper.NoticeMapper; import com.hnac.hzims.spare.service.INoticeService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.spare.entity.Notice; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; * @author Chill */ @Service -public class NoticeServiceImpl extends BaseServiceImpl implements INoticeService { +public class NoticeServiceImpl extends ServiceImpl implements INoticeService { @Override public IPage selectNoticePage(IPage page, Notice notice) { diff --git a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/utils/CodeDateRandomUtils.java b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/utils/CodeDateRandomUtils.java index 4836e87..8b94cb8 100644 --- a/hzims-service/spare/src/main/java/com/hnac/hzims/spare/utils/CodeDateRandomUtils.java +++ b/hzims-service/spare/src/main/java/com/hnac/hzims/spare/utils/CodeDateRandomUtils.java @@ -1,6 +1,6 @@ package com.hnac.hzims.spare.utils; -import org.apache.commons.lang.StringUtils; + import java.text.SimpleDateFormat; import java.util.Date; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/TicketApplication.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/TicketApplication.java index f4f7b31..fe85028 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/TicketApplication.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/TicketApplication.java @@ -4,11 +4,9 @@ import com.hnac.hzims.ticket.constants.TicketConstants; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; -import org.springblade.core.mp.plugins.SqlLogInterceptor; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; @@ -17,21 +15,23 @@ import javax.annotation.Resource; /** * @author hx */ -@EnableBladeFeign -@SpringCloudApplication + +@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"}) +@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"}) +@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"}) @MapperScan("com.hnac.hzims.**.mapper.**") @ComponentScan(basePackages = {"com.hnac"}) @Resource @EnableAspectJAutoProxy(exposeProxy = true) -public class TicketApplication extends SpringBootServletInitializer { +public class TicketApplication { public static void main(String[] args) { BladeApplication.run(TicketConstants.APP_NAME, TicketApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return BladeApplication.createSpringApplicationBuilder(builder, TicketConstants.APP_NAME, TicketApplication.class); - } +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return BladeApplication.createSpringApplicationBuilder(builder, TicketConstants.APP_NAME, TicketApplication.class); +// } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/jobhandler/TicketInfoStatistic.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/jobhandler/TicketInfoStatistic.java index 2b91316..77b7c6d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/jobhandler/TicketInfoStatistic.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/jobhandler/TicketInfoStatistic.java @@ -115,7 +115,7 @@ public class TicketInfoStatistic { //获取一种票据种类当月未完成票据数 ticketInfoStatistic.setTicketInfoStartNum(workTicketInfoMapper.countByMap(queryMap)); //获取一种票据种类当月延期票据数 - ticketInfoStatistic.setTicketInfoDelayNum(workTicketDelayService.count()); + ticketInfoStatistic.setTicketInfoDelayNum((int)workTicketDelayService.count()); //根据当月完成票据的评价合格数，和当月完成的票据做计算。 int qualifiedCount = workTicketInfoMapper.qualifiedCount(Integer.valueOf(t.getDictKey()),year,month); ticketInfoStatistic.setTicketInfoProportion(IntegerProportion(qualifiedCount,completeCount)); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoEvaluateService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoEvaluateService.java index da12beb..229982a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoEvaluateService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoEvaluateService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.allTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface TicketInfoEvaluateService extends BaseService { +public interface TicketInfoEvaluateService extends IService { } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoStatisticService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoStatisticService.java index ff6cc53..ba49660 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoStatisticService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/TicketInfoStatisticService.java @@ -1,15 +1,16 @@ package com.hnac.hzims.ticket.allTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoStatisticEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface TicketInfoStatisticService extends BaseService { +public interface TicketInfoStatisticService extends IService { List getTicketStatistic(String dateTime); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoEvaluateServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoEvaluateServiceImpl.java index 82da59a..314b55b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoEvaluateServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoEvaluateServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.ticket.allTicket.mapper.TicketInfoEvaluateMapper; import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @Slf4j -public class TicketInfoEvaluateServiceImpl extends BaseServiceImpl implements TicketInfoEvaluateService { +public class TicketInfoEvaluateServiceImpl extends ServiceImpl implements TicketInfoEvaluateService { } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoStatisticServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoStatisticServiceImpl.java index 716bbb8..7a774f9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoStatisticServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/impl/TicketInfoStatisticServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.ticket.allTicket.service.TicketInfoStatisticService; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -18,7 +18,7 @@ import java.util.List; @Service @RequiredArgsConstructor @Slf4j -public class TicketInfoStatisticServiceImpl extends BaseServiceImpl implements TicketInfoStatisticService { +public class TicketInfoStatisticServiceImpl extends ServiceImpl implements TicketInfoStatisticService { @Resource TicketInfoStatisticMapper ticketInfoStatisticMapper; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/config/Swagger2Config.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/config/Swagger2Config.java index 6299226..1c613e9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/config/Swagger2Config.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/config/Swagger2Config.java @@ -12,7 +12,6 @@ import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * @Author WL @@ -43,8 +42,9 @@ public class Swagger2Config implements WebMvcConfigurer { .groupName("工作票") .apiInfo(webApiInfo()) .select() + //todo tyty //只显示api路径下的页面 - .paths(Predicates.and(PathSelectors.regex("/ticket-process/.*"))) +// .paths(Predicates.and(PathSelectors.regex("/ticket-process/.*"))) .build(); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/controller/TicketMatterGroupController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/controller/TicketMatterGroupController.java index 6ebc945..f478b34 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/controller/TicketMatterGroupController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/controller/TicketMatterGroupController.java @@ -19,7 +19,7 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.oss.model.BladeFile; @@ -53,7 +53,7 @@ public class TicketMatterGroupController extends BladeController { @ApiOperation(value = "逻辑删除") @Operate(label = "删除票据模板",type = BusinessType.DELETE,risk = Risk.MEDIUM,ignore = false) public R remove(@RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); + return R.status(service.removeByIds(Func.toLongList(ids))); } @PostMapping("/save") @@ -85,7 +85,7 @@ public class TicketMatterGroupController extends BladeController { // return R.data(TicketMatterGroupWrapper.build().entityVO(entity)); } - @ApiLog + @GetMapping("/queryList") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页") @@ -95,7 +95,7 @@ public class TicketMatterGroupController extends BladeController { } - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 60) @ApiOperation(value = "查询") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/ITicketMatterGroupService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/ITicketMatterGroupService.java index d724793..a399e66 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/ITicketMatterGroupService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/ITicketMatterGroupService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.library.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.library.dto.TicketMatterGroupDTO; import com.hnac.hzims.ticket.library.entity.TicketMatterGroupEntity; import com.hnac.hzims.ticket.library.vo.TicketMatterGroupVO; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.R; @@ -17,7 +18,7 @@ import java.io.IOException; /** * @author hx */ -public interface ITicketMatterGroupService extends BaseService { +public interface ITicketMatterGroupService extends IService { String ONE_TYPE = "1"; String TWO_TYPE = "2"; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/impl/TicketMatterGroupServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/impl/TicketMatterGroupServiceImpl.java index 31f3e82..3b72630 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/impl/TicketMatterGroupServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/library/service/impl/TicketMatterGroupServiceImpl.java @@ -39,7 +39,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xwpf.usermodel.XWPFDocument; 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.Query; import org.springblade.core.tool.api.R; @@ -63,7 +63,7 @@ import java.util.stream.IntStream; @Service @Slf4j @RequiredArgsConstructor -public class TicketMatterGroupServiceImpl extends BaseServiceImpl implements ITicketMatterGroupService { +public class TicketMatterGroupServiceImpl extends ServiceImpl implements ITicketMatterGroupService { /** word模板预览导出保存路径 **/ @Value("${hzims.ticket.path.xlsx.savePath}") @@ -146,7 +146,7 @@ public class TicketMatterGroupServiceImpl extends BaseServiceImpl { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java index f2b745f..676d71a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java @@ -9,7 +9,7 @@ import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Component; import org.springframework.util.Assert; @@ -25,7 +25,7 @@ import org.springframework.util.Assert; public class WorkTicketMsgConsume { private final IFirstWorkTicketService firstWorkTicketService; - private final BladeLogger logger; + @RedisMessageListener(topic = RedisMessageTopic.WORK_TICKET_MESSAGE_KEY) public void dealWorkTicketFlow(String message){ diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IOperRepairService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IOperRepairService.java index 6cdfd26..db80803 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IOperRepairService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IOperRepairService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.ticket.repair.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.repair.entity.RepairEntity; import com.hnac.hzims.ticket.repair.vo.RepairVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.flow.core.vo.ComleteTask; @@ -12,7 +13,7 @@ import java.util.List; /** * @author ysj */ -public interface IOperRepairService extends BaseService { +public interface IOperRepairService extends IService { /** * 获取应急抢修记录 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IWorkTaskService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IWorkTaskService.java index 6db49f1..cd0b056 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IWorkTaskService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/IWorkTaskService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.repair.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity; import com.hnac.hzims.ticket.repair.vo.WorkTaskVO; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; /** * @author ysj */ -public interface IWorkTaskService extends BaseService { +public interface IWorkTaskService extends IService { boolean start(WorkTaskVO workTask); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/OperRepairServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/OperRepairServiceImpl.java index 4f5976c..264600f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/OperRepairServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/OperRepairServiceImpl.java @@ -24,7 +24,7 @@ import com.hnac.hzims.ticket.utils.PdfUtils; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.usermodel.Workbook; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -56,7 +56,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class OperRepairServiceImpl extends BaseServiceImpl implements IOperRepairService { +public class OperRepairServiceImpl extends ServiceImpl implements IOperRepairService { private final IOperDefectClient defectClient; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java index cebe8a9..629a069 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java @@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xwpf.usermodel.XWPFDocument; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -61,7 +61,7 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class WorkTaskServiceImpl extends BaseServiceImpl implements IWorkTaskService { +public class WorkTaskServiceImpl extends ServiceImpl implements IWorkTaskService { private final IWorkTicketInfoService workTicketInfoService; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java index 6897040..63b1474 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java @@ -1,7 +1,7 @@ package com.hnac.hzims.ticket.standardTicket.controller; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -92,7 +92,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.detail(id); } - @ApiLog + @PostMapping("/queryList") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页") @@ -101,7 +101,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.queryList(req, query); } - @ApiLog + @PostMapping("/exportStandardTicket") @ApiOperationSupport(order = 2) @ApiOperation(value = "操作票导出") @@ -138,7 +138,7 @@ public class StandardTicketInfoController extends BladeController { map.put("isSuccess", "false"); map.put("msg", "操作票统计报表导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketMeasureController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketMeasureController.java index 6b69fae..fee9b90 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketMeasureController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketMeasureController.java @@ -43,7 +43,7 @@ public class StandardTicketMeasureController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(standardTicketMeasureService.deleteLogic(Func.toLongList(ids))); + return R.status(standardTicketMeasureService.removeByIds(Func.toLongList(ids))); } @PostMapping("/save") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java index f426add..af31217 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java @@ -2,6 +2,7 @@ package com.hnac.hzims.ticket.standardTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketVo; @@ -14,7 +15,7 @@ import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo; import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -27,7 +28,7 @@ import java.util.List; /** * @author hx */ -public interface IStandardTicketInfoService extends BaseService { +public interface IStandardTicketInfoService extends IService { /** * 查看详情 * @param id diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketMeasureService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketMeasureService.java index c00c67e..7fd4a2a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketMeasureService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketMeasureService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.standardTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.standardTicket.dto.StandardTicketMeasureDto; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketMeasureEntity; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketMeasureVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -17,7 +18,7 @@ import java.util.List; /** * @author hx */ -public interface IStandardTicketMeasureService extends BaseService { +public interface IStandardTicketMeasureService extends IService { /** * 查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 645f899..36aea58 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -46,7 +46,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -88,7 +88,7 @@ import java.util.stream.IntStream; @Service @RequiredArgsConstructor @Slf4j -public class StandardTicketInfoServiceImpl extends BaseServiceImpl implements IStandardTicketInfoService { +public class StandardTicketInfoServiceImpl extends ServiceImpl implements IStandardTicketInfoService { private final IStandardTicketMeasureService standardTicketMeasureService; @@ -469,7 +469,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl ticketInfoEvaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getTicketId, item.getId()); ticketInfoEvaluateEntityLambdaQueryWrapper.eq(TicketInfoEvaluateEntity::getStatus, TicketConstants.TicketQualifiedEnum.Qualified.getCode()); - int count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper); + long count = ticketInfoEvaluateService.count(ticketInfoEvaluateEntityLambdaQueryWrapper); return count > 0; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketMeasureServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketMeasureServiceImpl.java index 1efee00..9b0f4b7 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketMeasureServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketMeasureServiceImpl.java @@ -18,7 +18,7 @@ import com.hnac.hzims.ticket.standardTicket.wrapper.StandardTicketMeasureWrapper import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -40,7 +40,7 @@ import java.util.List; @Service @RequiredArgsConstructor @Slf4j -public class StandardTicketMeasureServiceImpl extends BaseServiceImpl implements IStandardTicketMeasureService { +public class StandardTicketMeasureServiceImpl extends ServiceImpl implements IStandardTicketMeasureService { private final IFlowClient flowClient; private final StandardTicketInfoMapper standardTicketInfoMapper; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/ITwoTicketService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/ITwoTicketService.java index 56b2935..8b11677 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/ITwoTicketService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/ITwoTicketService.java @@ -1,7 +1,9 @@ package com.hnac.hzims.ticket.twoTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tenant.mp.TenantEntity; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.SpringUtil; @@ -11,7 +13,7 @@ import org.springblade.flow.core.vo.ComleteTask; /** * @author hx */ -public interface ITwoTicketService extends BaseService { +public interface ITwoTicketService extends IService { /** * 生成两票编码 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketCountService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketCountService.java index 8d10883..6146ba1 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketCountService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketCountService.java @@ -1,9 +1,10 @@ package com.hnac.hzims.ticket.twoTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.twoTicket.entity.TicketCount; import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountResponseVo; import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo; -import org.springblade.core.mp.base.BaseService; + import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; * @Serial 1.0 * @Date 2023/7/3 13:37 */ -public interface TicketCountService extends BaseService { +public interface TicketCountService extends IService { /** * 两票生成月报统计 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java index 4ff1b08..0ecb0d8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java @@ -2,7 +2,6 @@ package com.hnac.hzims.ticket.twoTicket.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.word.WordExportUtil; -import cn.hutool.core.io.resource.FileResource; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -41,6 +40,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xwpf.usermodel.*; import org.springblade.core.log.exception.ServiceException; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -75,8 +75,6 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.aspectj.weaver.tools.cache.SimpleCacheFactory.path; -import static org.springframework.transaction.support.TransactionSynchronizationManager.getResource; /** * @author hx @@ -84,7 +82,7 @@ import static org.springframework.transaction.support.TransactionSynchronization @Service("firstWorkTicketService") @Slf4j @RequiredArgsConstructor -public class FirstWorkTicketServiceImpl extends BaseServiceImpl +public class FirstWorkTicketServiceImpl extends ServiceImpl implements IFirstWorkTicketService { private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FlipOperateTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FlipOperateTicketServiceImpl.java index 83ef289..df936ca 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FlipOperateTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FlipOperateTicketServiceImpl.java @@ -6,7 +6,7 @@ import com.hnac.hzims.ticket.standardTicket.mapper.StandardTicketInfoMapper; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO; import com.hnac.hzims.ticket.twoTicket.service.IFlipOperateTicketService; 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.api.R; import org.springblade.flow.core.vo.ComleteTask; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; */ @Service("flipOperateTicketService") @Slf4j -public class FlipOperateTicketServiceImpl extends BaseServiceImpl +public class FlipOperateTicketServiceImpl extends ServiceImpl implements IFlipOperateTicketService { @Override public String generateCode() { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/MechanicalTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/MechanicalTicketServiceImpl.java index b26fc71..2bfa981 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/MechanicalTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/MechanicalTicketServiceImpl.java @@ -17,7 +17,7 @@ import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; -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.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class MechanicalTicketServiceImpl extends BaseServiceImpl implements IMechanicalTicketService { +public class MechanicalTicketServiceImpl extends ServiceImpl implements IMechanicalTicketService { private final IFirstWorkTicketService workTicketService; /**word模板预览导出保存路径**/ diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/SecondTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/SecondTicketServiceImpl.java index 55b76f6..4c104a2 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/SecondTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/SecondTicketServiceImpl.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -49,7 +49,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class SecondTicketServiceImpl extends BaseServiceImpl implements ISecondTicketService { +public class SecondTicketServiceImpl extends ServiceImpl implements ISecondTicketService { private final IFirstWorkTicketService firstWorkTicketService; private final IWorkTicketContentService contentService; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java index 915a6ea..a0f3dde 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java @@ -23,8 +23,7 @@ import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo; import com.hnac.hzims.ticket.utils.PercentCountUtils; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService; -import io.micrometer.core.instrument.binder.BaseUnits; -import jodd.util.ObjectUtil; + import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -36,7 +35,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.aspectj.bridge.MessageWriter; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -66,7 +65,7 @@ import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class TicketCountServiceImpl extends BaseServiceImpl implements TicketCountService { +public class TicketCountServiceImpl extends ServiceImpl implements TicketCountService { private final ThreadPoolExecutor executor; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 743651d..ba3829a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -47,7 +47,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; 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.tool.api.R; import org.springblade.core.tool.utils.*; @@ -151,7 +151,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { private final ISysClient sysClient; - private final BladeLogger logger; + /** @@ -163,7 +163,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { @Override @Transactional public Long startUp(WorkTicketVo workTicketVo) { - logger.info("ticket:start:request",JSON.toJSONString(workTicketVo)); + log.info("ticket:start:request",JSON.toJSONString(workTicketVo)); log.info("执行 com.hnac.hzims.ticket.twoTicket.service.impl【startUp】 。。。方法"); if (workTicketVo.getWorkTicket().getSignage() == null) { throw new ServiceException("票据抬头未配置，请您到站点管理配置"); @@ -201,7 +201,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { } workTicketVo.getWorkTicket().setCode(code); //3 .保存工作对象 - logger.info("ticket:start:vo",JSON.toJSONString(workTicketVo.getWorkTicket())); + log.info("ticket:start:vo",JSON.toJSONString(workTicketVo.getWorkTicket())); this.saveWorkTicketInfo(workTicketVo.getWorkTicket()); //4. 保存安全措施 this.saveSafetyMeasures(workTicketVo.getSafetyMeasuresList(), workTicketVo.getWorkTicket()); @@ -871,7 +871,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { workTicket.setIsRailway(false); workTicket.setIsLimited(false); boolean isSave = firstWorkTicketService.save(workTicket); - logger.info("ticket:start:save",JSON.toJSONString(workTicket)); + log.info("ticket:start:save",JSON.toJSONString(workTicket)); if (!isSave) { throw new IllegalArgumentException("保存工作对象错误"); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/CodeUtils.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/CodeUtils.java index d943bfb..cc7398a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/CodeUtils.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/CodeUtils.java @@ -5,7 +5,7 @@ import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.SpringUtil; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/TwoTicketMatterLibraryController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/TwoTicketMatterLibraryController.java index 83e3079..8cf4283 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/TwoTicketMatterLibraryController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/TwoTicketMatterLibraryController.java @@ -36,7 +36,7 @@ public class TwoTicketMatterLibraryController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(twoTicketMatterLibraryService.deleteLogic(Func.toLongList(ids))); + return R.status(twoTicketMatterLibraryService.removeByIds(Func.toLongList(ids))); } @PostMapping("/save") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketDelayController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketDelayController.java index d59b408..88171a1 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketDelayController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketDelayController.java @@ -46,7 +46,7 @@ public class WorkTicketDelayController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketDelayService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketDelayService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketFlowController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketFlowController.java index e3fa208..6e85bbb 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketFlowController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketFlowController.java @@ -43,7 +43,7 @@ public class WorkTicketFlowController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketFlowService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketFlowService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java index 03a6735..7603ed9 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java @@ -1,8 +1,8 @@ package com.hnac.hzims.ticket.workTicket.controller; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -27,7 +27,7 @@ import com.hnac.hzinfo.log.contants.BusinessType; import com.hnac.hzinfo.log.contants.Risk; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.log.annotation.ApiLog; + import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -114,7 +114,7 @@ public class WorkTicketInfoController { /** * 分页 */ - @ApiLog + @PostMapping("/queryList") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页") @@ -131,7 +131,7 @@ public class WorkTicketInfoController { public void exportWorkTicketInfoPdf(@RequestParam Long id, HttpServletResponse response) { workTicketInfoService.exportWorkTicketInfoPdf(id, response); } - @ApiLog + @PostMapping("/exportWorkTicket") @ApiOperationSupport(order = 2) @ApiOperation(value = "工作票导出") @@ -170,7 +170,7 @@ public class WorkTicketInfoController { map.put("isSuccess", "false"); map.put("msg", "工作票统计报表导出失败" + e.getMessage()); try { - response.getWriter().println(JSONUtils.toJSONString(map)); + response.getWriter().println(JSON.toJSONString(map)); } catch (IOException e3) { throw new ServiceException( "发生异常 :" + e); } @@ -214,7 +214,7 @@ public class WorkTicketInfoController { return workTicketInfoService.licenseOfflineTicket(req); } - @ApiLog + @GetMapping("/userListByRoleAlias") @ApiOperationSupport(order = 100) @ApiOperation(value = "获取某机构下角色的人员列表") @@ -258,7 +258,7 @@ public class WorkTicketInfoController { /** * 获取工作票台账、 */ - @ApiLog + @GetMapping("/getWorkTicketBill") @ApiOperation(value = "获取工作票台账") public R> getWorkTicketBill(String emCode, String startTime, String endTime) { @@ -272,7 +272,7 @@ public class WorkTicketInfoController { return R.data(workTicketInfoService.work(Condition.getPage(query),work)); } - @ApiLog + @PostMapping("/cancel") @ApiOperationSupport(order = 50) @ApiOperation(value = "线下工作票作废") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketMembersChangeController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketMembersChangeController.java index ce3c060..999bfab 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketMembersChangeController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketMembersChangeController.java @@ -43,7 +43,7 @@ public class WorkTicketMembersChangeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketMembersChangeService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketMembersChangeService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketOperateTimeController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketOperateTimeController.java index 8ca20d3..6967b6c 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketOperateTimeController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketOperateTimeController.java @@ -43,7 +43,7 @@ public class WorkTicketOperateTimeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketOperateTimeService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketOperateTimeService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketPrincipalChangeController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketPrincipalChangeController.java index 3d47712..1e19ef5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketPrincipalChangeController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketPrincipalChangeController.java @@ -43,7 +43,7 @@ public class WorkTicketPrincipalChangeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketPrincipalChangeService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketPrincipalChangeService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketSafetyMeasureController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketSafetyMeasureController.java index 325c545..635a535 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketSafetyMeasureController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketSafetyMeasureController.java @@ -39,7 +39,7 @@ public class WorkTicketSafetyMeasureController { @ApiOperationSupport(order = 10) @ApiOperation(value = "逻辑删除") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workTicketSafetyMeasureService.deleteLogic(Func.toLongList(ids))); + return R.status(workTicketSafetyMeasureService.removeByIds(Func.toLongList(ids))); } /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IOfflineTicketService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IOfflineTicketService.java index cb7b477..5e83069 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IOfflineTicketService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IOfflineTicketService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.workTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.TicketAccessTaskDto; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; -import org.springblade.core.mp.base.BaseService; -public interface IOfflineTicketService extends BaseService { + +public interface IOfflineTicketService extends IService { boolean invoicing(WorkTicketInfoDto dto); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/ITwoTicketMatterLibraryService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/ITwoTicketMatterLibraryService.java index ddae99d..70f8db4 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/ITwoTicketMatterLibraryService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/ITwoTicketMatterLibraryService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.TwoTicketMatterLibraryDto; import com.hnac.hzims.ticket.workTicket.entity.TwoTicketMatterLibraryEntity; import com.hnac.hzims.ticket.workTicket.vo.TwoTicketMatterLibraryVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -18,7 +19,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface ITwoTicketMatterLibraryService extends BaseService { +public interface ITwoTicketMatterLibraryService extends IService { /** * 分页查询 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentService.java index 61f3cb8..aa2091b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.ticket.workTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketContentEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IWorkTicketContentService extends BaseService { +public interface IWorkTicketContentService extends IService { /** * 查询列表 * @param req 请求筛选条件 -ticketId diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentTemService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentTemService.java index c510e14..9111d30 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentTemService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketContentTemService.java @@ -1,14 +1,15 @@ package com.hnac.hzims.ticket.workTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketContentTempEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IWorkTicketContentTemService extends BaseService { +public interface IWorkTicketContentTemService extends IService { /** * 根据筛选条件获取工作票模板工作任务列表 * @param req templateId diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketDelayService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketDelayService.java index d83cb84..fe65fd6 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketDelayService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketDelayService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketDelayDto; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketDelayVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -21,7 +22,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketDelayService extends BaseService { +public interface IWorkTicketDelayService extends IService { /** * 分页查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketFlowService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketFlowService.java index dd43267..a7f336e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketFlowService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketFlowService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketFlowDto; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketFlowEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketFlowVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.flow.core.vo.ComleteTask; @@ -21,7 +22,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketFlowService extends BaseService { +public interface IWorkTicketFlowService extends IService { /** * 分页查询 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index 0e1603b..d3509ce 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -2,6 +2,7 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo; import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo; import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo; @@ -14,7 +15,7 @@ import com.hnac.hzims.ticket.workTicket.vo.WorkTicketExportVO; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO; import com.hnac.hzims.ticket.workTicket.vo.WorkVO; import com.hnac.hzims.vo.SafeCheckStatisticVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -32,7 +33,7 @@ import java.util.Map; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketInfoService extends BaseService { +public interface IWorkTicketInfoService extends IService { /** * 保存 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMeasureTempService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMeasureTempService.java index 240ebc1..ad3b337 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMeasureTempService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMeasureTempService.java @@ -1,12 +1,13 @@ package com.hnac.hzims.ticket.workTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketMeasureTempEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface IWorkTicketMeasureTempService extends BaseService { +public interface IWorkTicketMeasureTempService extends IService { } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMembersChangeService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMembersChangeService.java index 8db22cc..086f0a6 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMembersChangeService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketMembersChangeService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketMembersChangeDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketMembersChangeEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketMembersChangeVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -19,7 +20,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketMembersChangeService extends BaseService { +public interface IWorkTicketMembersChangeService extends IService { /** * 分页查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketOperateTimeService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketOperateTimeService.java index ac7c339..6599fb8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketOperateTimeService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketOperateTimeService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketOperateTimeDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketOperateTimeEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketOperateTimeVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -18,7 +19,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketOperateTimeService extends BaseService { +public interface IWorkTicketOperateTimeService extends IService { /** * 分页查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketPrincipalChangeService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketPrincipalChangeService.java index 1980210..65c7cb4 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketPrincipalChangeService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketPrincipalChangeService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketPrincipalChangeDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketPrincipalChangeVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -19,7 +20,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketPrincipalChangeService extends BaseService { +public interface IWorkTicketPrincipalChangeService extends IService { /** * 分页查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketSafetyMeasureService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketSafetyMeasureService.java index d71bf7d..44ec318 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketSafetyMeasureService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketSafetyMeasureService.java @@ -1,10 +1,11 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.dto.WorkTicketSafetyMeasureDto; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketSafetyMeasureEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketSafetyMeasureVO; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -18,7 +19,7 @@ import java.util.List; * @author hx * @since 2021-10-22 */ -public interface IWorkTicketSafetyMeasureService extends BaseService { +public interface IWorkTicketSafetyMeasureService extends IService { /** * 分页查询 * @param req diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketTemplateService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketTemplateService.java index 1c6d0b8..5503acf 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketTemplateService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketTemplateService.java @@ -1,11 +1,12 @@ package com.hnac.hzims.ticket.workTicket.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketTemplateEntity; -import org.springblade.core.mp.base.BaseService; + /** * @author hx */ -public interface IWorkTicketTemplateService extends BaseService { +public interface IWorkTicketTemplateService extends IService { } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java index 179898e..3647e3b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java @@ -21,7 +21,7 @@ import com.hnac.hzims.ticket.workTicket.service.IWorkTicketSafetyMeasureService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -53,7 +53,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @Service @Slf4j -public class OfflineTicketServiceImpl extends BaseServiceImpl implements IOfflineTicketService { +public class OfflineTicketServiceImpl extends ServiceImpl implements IOfflineTicketService { private final IStationClient stationClient; private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService; private final IWorkTicketContentService contentService; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/TwoTicketMatterLibraryServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/TwoTicketMatterLibraryServiceImpl.java index 526b2cc..142ff43 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/TwoTicketMatterLibraryServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/TwoTicketMatterLibraryServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.ticket.workTicket.service.ITwoTicketMatterLibraryService; import com.hnac.hzims.ticket.workTicket.vo.TwoTicketMatterLibraryVO; import com.hnac.hzims.ticket.workTicket.wrapper.TwoTicketMatterLibraryWrapper; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.api.R; @@ -30,7 +30,7 @@ import java.util.List; */ @Service @Slf4j -public class TwoTicketMatterLibraryServiceImpl extends BaseServiceImpl implements ITwoTicketMatterLibraryService { +public class TwoTicketMatterLibraryServiceImpl extends ServiceImpl implements ITwoTicketMatterLibraryService { @Override public R> queryList(TwoTicketMatterLibraryDto req, Query query) { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentServiceImpl.java index 1b9bd2f..3f84894 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentServiceImpl.java @@ -7,7 +7,7 @@ import com.hnac.hzims.ticket.workTicket.entity.WorkTicketSafetyMeasureEntity; import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketContentMapper; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketContentService; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; */ @Service @Slf4j -public class WorkTicketContentServiceImpl extends BaseServiceImpl implements IWorkTicketContentService { +public class WorkTicketContentServiceImpl extends ServiceImpl implements IWorkTicketContentService { @Override public List list(WorkTicketContentEntity req) { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentTemServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentTemServiceImpl.java index 7716ed2..ce34774 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentTemServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketContentTemServiceImpl.java @@ -3,7 +3,7 @@ package com.hnac.hzims.ticket.workTicket.service.impl; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketContentTempEntity; import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketContentTemMapper; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketContentTemService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * @author hx */ @Service -public class WorkTicketContentTemServiceImpl extends BaseServiceImpl implements IWorkTicketContentTemService { +public class WorkTicketContentTemServiceImpl extends ServiceImpl implements IWorkTicketContentTemService { @Override public List list(WorkTicketContentTempEntity req) { return this.list(Condition.getQueryWrapper(new WorkTicketContentTempEntity(),req)); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketDelayServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketDelayServiceImpl.java index 5fc1e49..b362b1b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketDelayServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketDelayServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.ticket.workTicket.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,10 +23,9 @@ import com.hnac.hzims.ticket.workTicket.vo.WorkTicketDelayVO; import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketDelayWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -54,7 +54,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class WorkTicketDelayServiceImpl extends BaseServiceImpl implements IWorkTicketDelayService { +public class WorkTicketDelayServiceImpl extends ServiceImpl implements IWorkTicketDelayService { private final WorkTicketInfoMapper infoMapper; private final IFlowClient flowClient; private final IOperAccessTaskClient taskClient; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketFlowServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketFlowServiceImpl.java index e2727f0..1949d1f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketFlowServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketFlowServiceImpl.java @@ -22,7 +22,7 @@ import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketFlowWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.tool.api.R; @@ -49,7 +49,7 @@ import java.util.Map; @Service @AllArgsConstructor @Slf4j -public class WorkTicketFlowServiceImpl extends BaseServiceImpl implements IWorkTicketFlowService { +public class WorkTicketFlowServiceImpl extends ServiceImpl implements IWorkTicketFlowService { private final WorkTicketInfoMapper workTicketInfoMapper; private final IFlowClient flowClient; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index 269dff3..aec8082 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -50,7 +50,7 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.poi.ss.usermodel.Workbook; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -95,7 +95,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor -public class WorkTicketInfoServiceImpl extends BaseServiceImpl implements IWorkTicketInfoService { +public class WorkTicketInfoServiceImpl extends ServiceImpl implements IWorkTicketInfoService { private final IWorkTicketSafetyMeasureService workTicketSafetyMeasureService; private final IWorkTicketPrincipalChangeService workTicketPrincipalChangeService; @@ -940,7 +940,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl 0; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMeasureTempServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMeasureTempServiceImpl.java index b8e5dac..882080a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMeasureTempServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMeasureTempServiceImpl.java @@ -3,13 +3,13 @@ package com.hnac.hzims.ticket.workTicket.service.impl; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketMeasureTempEntity; import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketMeasureTempMapper; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketMeasureTempService; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * @author hx */ @Service -public class WorkTicketMeasureTempServiceImpl extends BaseServiceImpl +public class WorkTicketMeasureTempServiceImpl extends ServiceImpl implements IWorkTicketMeasureTempService { } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMembersChangeServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMembersChangeServiceImpl.java index ae709f4..867b330 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMembersChangeServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketMembersChangeServiceImpl.java @@ -12,7 +12,7 @@ import com.hnac.hzims.ticket.workTicket.vo.WorkTicketMembersChangeVO; import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketMembersChangeWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.Query; import org.springblade.core.tool.api.R; @@ -34,7 +34,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class WorkTicketMembersChangeServiceImpl extends BaseServiceImpl implements IWorkTicketMembersChangeService { +public class WorkTicketMembersChangeServiceImpl extends ServiceImpl implements IWorkTicketMembersChangeService { private final WorkTicketInfoMapper workTicketInfoMapper; private final IFlowClient flowClient; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketOperateTimeServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketOperateTimeServiceImpl.java index 702ae59..a58b61e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketOperateTimeServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketOperateTimeServiceImpl.java @@ -9,7 +9,7 @@ import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketOperateTimeMapper; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketOperateTimeService; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketOperateTimeVO; import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketOperateTimeWrapper; -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.Query; import org.springblade.core.tool.api.R; @@ -27,7 +27,7 @@ import java.util.List; * @since 2021-10-22 */ @Service -public class WorkTicketOperateTimeServiceImpl extends BaseServiceImpl implements IWorkTicketOperateTimeService { +public class WorkTicketOperateTimeServiceImpl extends ServiceImpl implements IWorkTicketOperateTimeService { @Override public R> queryList(WorkTicketOperateTimeDto req, Query query) { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketPrincipalChangeServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketPrincipalChangeServiceImpl.java index 91946b7..dec6bc0 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketPrincipalChangeServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketPrincipalChangeServiceImpl.java @@ -19,7 +19,7 @@ import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketPrincipalChangeWrapppe import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseEntity; -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.Query; import org.springblade.core.tool.api.R; @@ -39,7 +39,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class WorkTicketPrincipalChangeServiceImpl extends BaseServiceImpl implements IWorkTicketPrincipalChangeService { +public class WorkTicketPrincipalChangeServiceImpl extends ServiceImpl implements IWorkTicketPrincipalChangeService { private final WorkTicketInfoMapper workTicketInfoMapper; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketSafetyMeasureServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketSafetyMeasureServiceImpl.java index 71fb8a7..e63e8eb 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketSafetyMeasureServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketSafetyMeasureServiceImpl.java @@ -17,7 +17,7 @@ import com.hnac.hzims.ticket.workTicket.wrapper.WorkTicketSafetyMeasureWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; @Service @Slf4j @AllArgsConstructor -public class WorkTicketSafetyMeasureServiceImpl extends BaseServiceImpl implements IWorkTicketSafetyMeasureService { +public class WorkTicketSafetyMeasureServiceImpl extends ServiceImpl implements IWorkTicketSafetyMeasureService { private final WorkTicketInfoMapper workTicketInfoMapper; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketTemplateServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketTemplateServiceImpl.java index dc1d0df..341b7e5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketTemplateServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketTemplateServiceImpl.java @@ -5,7 +5,7 @@ import com.hnac.hzims.ticket.workTicket.mapper.WorkTicketTemplateMapper; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketTemplateService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @AllArgsConstructor -public class WorkTicketTemplateServiceImpl extends BaseServiceImpl implements IWorkTicketTemplateService { +public class WorkTicketTemplateServiceImpl extends ServiceImpl implements IWorkTicketTemplateService { } diff --git a/hzims-service/ticket/src/main/resources/application-dev.yml b/hzims-service/ticket/src/main/resources/application-dev.yml deleted file mode 100644 index 56b22dd..0000000 --- a/hzims-service/ticket/src/main/resources/application-dev.yml +++ /dev/null @@ -1,10 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} diff --git a/hzims-service/ticket/src/main/resources/application.yml b/hzims-service/ticket/src/main/resources/application.yml deleted file mode 100644 index a69f0f3..0000000 --- a/hzims-service/ticket/src/main/resources/application.yml +++ /dev/null @@ -1,58 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: - - classpath:org/example/**/mapper/*Mapper.xml - - classpath:/mapper/**/*.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springbalde - - com.hnac - - - - -#ticket: -# workTickets: -# - status: 1 -# flowId: startEvent1 -# segment: 开票 -# - status: 2 -# flowId: sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A -# segment: 签发人签发 -# - status: 3 -# flowId: sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1 -# segment: 运行人员接收 -# - status: 4 -# flowId: sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708 -# segment: 运行人员布置安全措施 -# - status: 5 -# flowId: sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22 -# segment: 工作负责人确认安全措施 -# - status: 6 -# flowId: sid-5476EB52-438F-4C74-94FB-88A6EA6625EA -# segment: 工作负责人确认工作内容执行 -# - status: 7 -# flowId: sid-72E8C993-D426-476F-BF7F-F7EC3B783022 -# segment: 许可人确认工作票结束、终结 -# - status: 8 -# flowId: sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C -# segment: 工作负责人确认工作票结束、终结 -# - status: 9 -# flowId: sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418 -# segment: 签发人审核 -# - status: 10 -# flowId: sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5 -# segment: 许可人许可 -# - status: 11 -# flowId: sid-FB7BF0B3-5189-437F-B29D-B87E22A81460 -# segment: 工作票转移 -# - status: 12 -# flowId: sid-6358A80D-F592-4875-B281-A5B14A0EA39E -# segment: 工作票延期 - diff --git a/hzims-service/ticket/src/main/resources/bootstrap.yml b/hzims-service/ticket/src/main/resources/bootstrap.yml deleted file mode 100644 index 4e6ce20..0000000 --- a/hzims-service/ticket/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - cloud: - nacos: - discovery: - server-addr: 175.6.40.67:10042 - config: - extension-configs: - - data-id: hzims-ticket-dev.yaml - group: DEFAULT_GROUP - refresh: true - namespace: public - diff --git a/hzims-service/ticket/src/main/resources/template/template.yml b/hzims-service/ticket/src/main/resources/template/template.yml new file mode 100644 index 0000000..3c3e591 --- /dev/null +++ b/hzims-service/ticket/src/main/resources/template/template.yml @@ -0,0 +1,123 @@ +#服务器端口 +server: + port: 8200 + +#oss配置 +oss: + enable: true + name: minio + tenant-mode: true + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + bucket-name: dev200000 +#数据源配置 +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_ticket?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.safeproduct + +xxl: + job: + accessToken: '' + admin: + addresses: "http://${hzims.server.ip}:7009/xxl-job-admin" + executor: + appname: hzims-ticket + ip: "${hzims.server.ip}" + logpath: /data/applogs/xxl-job/jobhandler + logretentiondays: 7 + port: 28601 + + +hzims: + tenantId: 200000 + url: + stampImage: "F:/pdf/盖章.jpeg" # windows + ticket: + workTask: + saveWrokTask: + work: /data/hzims/ticket/workTask/save/work/ + pdf: /data/hzims/ticket/workTask/save/pdf/ + defect: + saveRepair: + xlsx: /data/hzims/ticket/defect/save/xlsx/ + pdf: /data/hzims/ticket/defect/save/pdf/ + path: + pdf: + firstWorkTicketTemplate: "/data/hzims/ticket/pdf/template/第一种电气工作票.pdf" # linux + operateTicketTemplate: "/data/hzims/ticket/pdf/template/操作票.pdf" # linux + savePath: "/data/hzims/ticket/pdf/save/" + img: + stampImage: "/data/hzims/ticket/image/盖章.jpeg" #linux + word: + templatePath: "/data/hzims/ticket/word/template/" + savePath: "/data/hzims/ticket/word/save/" + xlsx: + # "/data/hzims/ticket/xlsx/save/" + savePath: E:/excel + standard-flow-key: standardTicketFlow + first-work-flow-key: firstWorkTicket + first-work-flow-key-new: newFirstWorkTicket + app-config-business-key: ticket_invalid + + +ticket: + workTickets: + - status: 1 + flowId: startEvent1 + segment: 开票 + - status: 2 + flowId: sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A + segment: 签发人签发 + - status: 3 + flowId: sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1 + segment: 运行人员接收 + - status: 4 + flowId: sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708 + segment: 运行人员布置安全措施 + - status: 5 + flowId: sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22 + segment: 工作负责人确认安全措施 + - status: 6 + flowId: sid-5476EB52-438F-4C74-94FB-88A6EA6625EA + segment: 工作负责人确认工作内容执行 + - status: 7 + flowId: sid-72E8C993-D426-476F-BF7F-F7EC3B783022 + segment: 许可人确认工作票结束、终结 + - status: 8 + flowId: sid-308606FE-820A-4A23-AF2A-4B1E9BBD267C + segment: 工作负责人确认工作票结束、终结 + - status: 9 + flowId: sid-DABC1AF3-EB78-4913-8BFE-EA44C887B418 + segment: 签发人审核 + - status: 10 + flowId: sid-48995D69-1E09-4ED2-8C81-5D1A6D015FA5 + segment: 许可人许可 + - status: 11 + flowId: sid-FB7BF0B3-5189-437F-B29D-B87E22A81460 + segment: 工作票转移 + - status: 12 + flowId: sid-6358A80D-F592-4875-B281-A5B14A0EA39E + segment: 工作票延期 + diff --git a/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/TicketApplicationTest.java b/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/TicketApplicationTest.java index 59a498a..37902d6 100644 --- a/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/TicketApplicationTest.java +++ b/hzims-service/ticket/src/test/java/com/hnac/hzims/ticket/TicketApplicationTest.java @@ -1,94 +1,94 @@ -package com.hnac.hzims.ticket; - -import com.alibaba.fastjson.JSON; -import com.google.common.collect.Lists; -import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; -import com.hnac.hzims.operational.feign.IAccessTaskClient; -import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; -import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService; -import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springblade.core.test.BladeBootTest; -import org.springblade.core.test.BladeSpringRunner; -import org.springblade.core.tool.utils.SpringUtil; -import org.springblade.flow.core.entity.BladeFlow; -import org.springblade.flow.core.feign.IFlowClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.test.context.SpringBootTest; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.List; - -@RunWith(BladeSpringRunner.class) -@SpringBootTest(classes = TicketApplication.class) -@BladeBootTest(appName = "hzims-ticket", profile = "test", enableLoader = true) -@Slf4j -public class TicketApplicationTest { - - @Autowired - private IFlowClient flowClient; - @Autowired - private IAccessTaskClient accessTaskClient; - @Autowired - @Qualifier("firstWorkTicketService") - private IFirstWorkTicketService firstWorkTicketService; - @Autowired - private IStandardTicketInfoService standardTicketInfoService; - - @Test - public void getTaskByProcessInstanceId() { - String processInstanceId = "6ae2ae5e-cd24-11ec-ac07-024271e8ca96"; - List bladeFlows = flowClient.getTaskByProcessInstanceId(processInstanceId).getData(); - log.info("结果为：{}", JSON.toJSONString(bladeFlows)); - } - - @Test - public void generateCode() { - //第一种工作票 -// FirstWTServiceImpl firstWTService = SpringUtil.getBean(FirstWTServiceImpl.class); - log.info(firstWorkTicketService.generateCode()); - } - - @Test - public void billingAccess() { - Long taskId = 1544890782292971521L; - accessTaskClient.billing(taskId); - } - - @Test - public void startTask() { - Long taskId = 1544890782292971521L; - String startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - accessTaskClient.startTask(taskId,startTime); - } - - @Test - public void finishTask() { - Long taskId = 1544890782292971521L; - int actHours = 11; - OperAccessTaskDTO accessTaskDTO = new OperAccessTaskDTO(); - accessTaskDTO.setId(taskId); - accessTaskDTO.setActHours(actHours); - accessTaskClient.finishTask(accessTaskDTO); - } - - @Test - public void workTicketReportStatistic () { - String startDate = "2022-07-01"; - String endDate = "2022-07-31"; - List deptIdList = Lists.newArrayList(2000000109L); -// TicketInfoStatisticVO ticketInfoStatisticVO = firstWorkTicketService.workTicketReportStatistic(startDate, endDate, deptIdList); -// log.info("{}",JSON.toJSONString(ticketInfoStatisticVO)); - } - - - @Test - public void worker() { - System.out.println(1); - } - -} +//package com.hnac.hzims.ticket; +// +//import com.alibaba.fastjson.JSON; +//import com.google.common.collect.Lists; +//import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO; +//import com.hnac.hzims.operational.feign.IAccessTaskClient; +//import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; +//import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService; +//import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; +//import lombok.extern.slf4j.Slf4j; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.springblade.core.test.BladeBootTest; +//import org.springblade.core.test.BladeSpringRunner; +//import org.springblade.core.tool.utils.SpringUtil; +//import org.springblade.flow.core.entity.BladeFlow; +//import org.springblade.flow.core.feign.IFlowClient; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Qualifier; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.time.LocalDateTime; +//import java.time.format.DateTimeFormatter; +//import java.util.List; +// +//@RunWith(BladeSpringRunner.class) +//@SpringBootTest(classes = TicketApplication.class) +//@BladeBootTest(appName = "hzims-ticket", profile = "test", enableLoader = true) +//@Slf4j +//public class TicketApplicationTest { +// +// @Autowired +// private IFlowClient flowClient; +// @Autowired +// private IAccessTaskClient accessTaskClient; +// @Autowired +// @Qualifier("firstWorkTicketService") +// private IFirstWorkTicketService firstWorkTicketService; +// @Autowired +// private IStandardTicketInfoService standardTicketInfoService; +// +// @Test +// public void getTaskByProcessInstanceId() { +// String processInstanceId = "6ae2ae5e-cd24-11ec-ac07-024271e8ca96"; +// List bladeFlows = flowClient.getTaskByProcessInstanceId(processInstanceId).getData(); +// log.info("结果为：{}", JSON.toJSONString(bladeFlows)); +// } +// +// @Test +// public void generateCode() { +// //第一种工作票 +//// FirstWTServiceImpl firstWTService = SpringUtil.getBean(FirstWTServiceImpl.class); +// log.info(firstWorkTicketService.generateCode()); +// } +// +// @Test +// public void billingAccess() { +// Long taskId = 1544890782292971521L; +// accessTaskClient.billing(taskId); +// } +// +// @Test +// public void startTask() { +// Long taskId = 1544890782292971521L; +// String startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); +// accessTaskClient.startTask(taskId,startTime); +// } +// +// @Test +// public void finishTask() { +// Long taskId = 1544890782292971521L; +// int actHours = 11; +// OperAccessTaskDTO accessTaskDTO = new OperAccessTaskDTO(); +// accessTaskDTO.setId(taskId); +// accessTaskDTO.setActHours(actHours); +// accessTaskClient.finishTask(accessTaskDTO); +// } +// +// @Test +// public void workTicketReportStatistic () { +// String startDate = "2022-07-01"; +// String endDate = "2022-07-31"; +// List deptIdList = Lists.newArrayList(2000000109L); +//// TicketInfoStatisticVO ticketInfoStatisticVO = firstWorkTicketService.workTicketReportStatistic(startDate, endDate, deptIdList); +//// log.info("{}",JSON.toJSONString(ticketInfoStatisticVO)); +// } +// +// +// @Test +// public void worker() { +// System.out.println(1); +// } +// +//} diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java index de9b4f0..c58caf5 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java @@ -12,7 +12,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import javax.validation.Valid; 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.Query; import org.springblade.core.redis.lock.RedisLock; @@ -53,7 +53,7 @@ public class ImsTopvisionUserController extends BladeController { /** * 分页 代码自定义代号 */ - @ApiLog + @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入topvisionUser") diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/TopvisionVideoController.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/TopvisionVideoController.java index 372391e..744b0bb 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/TopvisionVideoController.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/TopvisionVideoController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import javax.validation.Valid; 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.Query; import org.springblade.core.tool.api.R; @@ -70,7 +70,7 @@ public class TopvisionVideoController extends BladeController { * @param companyId * @return */ - @ApiLog + @GetMapping("/editList") @ApiOperationSupport(order = 2) @ApiOperation(value = "获取编辑列表 - 不分页", notes = "传入公司ID") @@ -117,7 +117,7 @@ public class TopvisionVideoController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(topvisionVideoService.deleteLogic(Func.toLongList(ids))); + return R.status(topvisionVideoService.removeByIds(Func.toLongList(ids))); } } diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/IImsTopvisionUserService.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/IImsTopvisionUserService.java index b668df7..a098034 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/IImsTopvisionUserService.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/IImsTopvisionUserService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hnac.hzims.topvision.dto.TopvisionUserInfo; import com.hnac.hzims.topvision.vo.UserVO; import com.hnac.hzims.topvision.entity.ImsTopvisionUserEntity; -import org.springblade.core.mp.base.BaseService; + import org.springblade.core.mp.support.Query; import org.springblade.system.user.entity.User; @@ -15,7 +15,7 @@ import java.util.List; * * @author Chill */ -public interface IImsTopvisionUserService extends BaseService { +public interface IImsTopvisionUserService extends IService { /** * 获取 未被选择的鼎视用户 diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/ITopvisionVideoService.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/ITopvisionVideoService.java index b4d3b93..86a5c40 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/ITopvisionVideoService.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/ITopvisionVideoService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.topvision.service; -import org.springblade.core.mp.base.BaseService; + import com.hnac.hzims.topvision.entity.TopvisionVideoEntity; import java.util.List; @@ -10,7 +10,7 @@ import java.util.List; * * @author Chill */ -public interface ITopvisionVideoService extends BaseService { +public interface ITopvisionVideoService extends IService { /** * 获取编辑列表 * @param companyId diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/ImsTopvisionUserServiceImpl.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/ImsTopvisionUserServiceImpl.java index 1bb353c..bd64c33 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/ImsTopvisionUserServiceImpl.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/ImsTopvisionUserServiceImpl.java @@ -12,7 +12,7 @@ import org.springblade.core.log.exception.ServiceException; import com.hnac.hzims.topvision.entity.ImsTopvisionUserEntity; import com.hnac.hzims.topvision.mapper.ImsTopvisionUserMapper; import com.hnac.hzims.topvision.service.IImsTopvisionUserService; -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.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * @author Chill */ @Service -public class ImsTopvisionUserServiceImpl extends BaseServiceImpl implements IImsTopvisionUserService { +public class ImsTopvisionUserServiceImpl extends ServiceImpl implements IImsTopvisionUserService { @Value("${topvision.url}") private String topvisionBaseUrl; diff --git a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/TopvisionVideoServiceImpl.java b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/TopvisionVideoServiceImpl.java index 6e063f3..1c7e76a 100644 --- a/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/TopvisionVideoServiceImpl.java +++ b/hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/service/impl/TopvisionVideoServiceImpl.java @@ -8,8 +8,8 @@ import okhttp3.MediaType; import org.joda.time.DateTime; import org.springblade.core.http.HttpRequest; import org.springblade.core.http.LogLevel; -import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.mp.base.BaseServiceImpl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.topvision.entity.TopvisionVideoEntity; import com.hnac.hzims.topvision.mapper.TopvisionVideoMapper; import com.hnac.hzims.topvision.service.ITopvisionVideoService; @@ -28,7 +28,7 @@ import java.util.stream.Stream; * @author Chill */ @Service -public class TopvisionVideoServiceImpl extends BaseServiceImpl implements ITopvisionVideoService { +public class TopvisionVideoServiceImpl extends ServiceImpl implements ITopvisionVideoService { private static final String TAG = "TopvisionVideoServiceImpl"; @Value("${topvision.url}") diff --git a/hzims-service/topvision/src/main/resources/application-dev.yml b/hzims-service/topvision/src/main/resources/application-dev.yml deleted file mode 100644 index 7c452b4..0000000 --- a/hzims-service/topvision/src/main/resources/application-dev.yml +++ /dev/null @@ -1,31 +0,0 @@ -#服务器端口 -server: - port: 8205 - -#数据源配置 -#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://192.168.1.31:3576/duty?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 - slave: - url: jdbc:mysql://192.168.1.31:3576/duty?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 -topvision: - #鼎视接口服务 - url: http://175.6.40.67:25381/topvision-api/ diff --git a/hzims-service/topvision/src/main/resources/application-prod.yml b/hzims-service/topvision/src/main/resources/application-prod.yml deleted file mode 100644 index 3cf0c6c..0000000 --- a/hzims-service/topvision/src/main/resources/application-prod.yml +++ /dev/null @@ -1,28 +0,0 @@ -#服务器端口 -server: - port: 8205 - -#数据源配置 -#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} diff --git a/hzims-service/topvision/src/main/resources/application-test.yml b/hzims-service/topvision/src/main/resources/application-test.yml deleted file mode 100644 index bd1786d..0000000 --- a/hzims-service/topvision/src/main/resources/application-test.yml +++ /dev/null @@ -1,28 +0,0 @@ -#服务器端口 -server: - port: 8205 - -#数据源配置 -#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} diff --git a/hzims-service/topvision/src/main/resources/application.yml b/hzims-service/topvision/src/main/resources/application.yml deleted file mode 100644 index bedb9c4..0000000 --- a/hzims-service/topvision/src/main/resources/application.yml +++ /dev/null @@ -1,21 +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 diff --git a/hzims-service/topvision/src/main/resources/template/template.yml b/hzims-service/topvision/src/main/resources/template/template.yml new file mode 100644 index 0000000..a23c283 --- /dev/null +++ b/hzims-service/topvision/src/main/resources/template/template.yml @@ -0,0 +1,73 @@ +#服务器端口 +server: + port: 8200 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + dynamic: + primary: hzims + datasource: + hzims: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.safeproduct + +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: 28200 + +hzims: + tenantId: 200000 + #ops-push + jgPushCode: ops-push + safeProduct: + safeTool: + filePath: /data/hzims/safeProduct/pdf/file + modulePath: /data/hzims/safeProduct/pdf/template/SafeToolTemplate.html + sadeToolKey: hzims:safeProduct:safeToolType + sms-code: aliyun-safeTool-push + rehearsal: + savePath: /data/hzims/safeproduct/rehearsal + train: + savePath: /data/hzims/safeproduct/train + conference: + savePath: /data/hzims/safeproduct/conference + hygiene: + savePath: /data/hzims/safeproduct/hygiene + car: + savePath: /data/hzims/safeproduct/car + risk: + save-path: /data/hzims/file/safeproduct/pdf \ No newline at end of file diff --git a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/schedule/StationWeatherSchedule.java b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/schedule/StationWeatherSchedule.java index 54e763f..0ffaa28 100644 --- a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/schedule/StationWeatherSchedule.java +++ b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/schedule/StationWeatherSchedule.java @@ -20,7 +20,7 @@ import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; + import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; diff --git a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IDailyHeWeatherService.java b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IDailyHeWeatherService.java index bbc7539..df6bcce 100644 --- a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IDailyHeWeatherService.java +++ b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IDailyHeWeatherService.java @@ -3,14 +3,14 @@ package com.hnac.hzims.weather.service; import com.hnac.hzims.hzimsweather.entity.DailyHeWeatherEntity; import com.hnac.hzims.hzimsweather.vo.DailyHeWeatherVo; import com.hnac.hzims.hzimsweather.vo.RainFallCountByMonthVo; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IDailyHeWeatherService extends BaseService { +public interface IDailyHeWeatherService extends IService { /** * 统计某年份的站点（区域、集团）下的降雨量 diff --git a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IStationService.java b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IStationService.java index 13ed13c..d794301 100644 --- a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IStationService.java +++ b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/IStationService.java @@ -1,14 +1,14 @@ package com.hnac.hzims.weather.service; import com.hnac.hzims.hzimsweather.entity.VStationEntity; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** * @author hx */ -public interface IStationService extends BaseService { +public interface IStationService extends IService { /** * 获取存在经纬度的站点 diff --git a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/DailyHeWeatherServiceImpl.java b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/DailyHeWeatherServiceImpl.java index 57ba19f..d48f28e 100644 --- a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/DailyHeWeatherServiceImpl.java +++ b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/DailyHeWeatherServiceImpl.java @@ -14,7 +14,7 @@ import com.hnac.hzims.weather.service.IDailyHeWeatherService; import jodd.util.StringUtil; import lombok.AllArgsConstructor; 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.ObjectUtil; import org.springframework.data.redis.core.RedisTemplate; @@ -32,7 +32,7 @@ import java.util.List; @Service @AllArgsConstructor @Slf4j -public class DailyHeWeatherServiceImpl extends BaseServiceImpl implements IDailyHeWeatherService { +public class DailyHeWeatherServiceImpl extends ServiceImpl implements IDailyHeWeatherService { private final DailyHeWeatherMapper dailyHeWeatherMapper; diff --git a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/StationServiceImpl.java b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/StationServiceImpl.java index 6a43719..dd43a21 100644 --- a/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/StationServiceImpl.java +++ b/hzims-service/weather/src/main/java/com/hnac/hzims/weather/service/impl/StationServiceImpl.java @@ -8,7 +8,7 @@ import com.hnac.hzims.weather.service.IStationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.List; * @author hx */ @Service -public class StationServiceImpl extends BaseServiceImpl implements IStationService { +public class StationServiceImpl extends ServiceImpl implements IStationService { @Override public List getStationWithLocation(String stationCodes) { diff --git a/hzims-service/weather/src/main/resources/template/template.yml b/hzims-service/weather/src/main/resources/template/template.yml new file mode 100644 index 0000000..a23c283 --- /dev/null +++ b/hzims-service/weather/src/main/resources/template/template.yml @@ -0,0 +1,73 @@ +#服务器端口 +server: + port: 8200 + +#oss配置 +oss: + endpoint: "${hzinfo.oss.endpoint}" + access-key: "${hzinfo.oss.access-key}" + secret-key: "${hzinfo.oss.secret-key}" + +#数据源配置 +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + dynamic: + primary: hzims + datasource: + hzims: + url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: ${hzinfo.db.busines.username} + password: ${hzinfo.db.busines.password} +# +# datasource: +# url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true" +# username: "${hzinfo.db.busines.username}" +# password: "${hzinfo.db.busines.password}" + + +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: com.hnac.hzims.safeproduct + +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: 28200 + +hzims: + tenantId: 200000 + #ops-push + jgPushCode: ops-push + safeProduct: + safeTool: + filePath: /data/hzims/safeProduct/pdf/file + modulePath: /data/hzims/safeProduct/pdf/template/SafeToolTemplate.html + sadeToolKey: hzims:safeProduct:safeToolType + sms-code: aliyun-safeTool-push + rehearsal: + savePath: /data/hzims/safeproduct/rehearsal + train: + savePath: /data/hzims/safeproduct/train + conference: + savePath: /data/hzims/safeproduct/conference + hygiene: + savePath: /data/hzims/safeproduct/hygiene + car: + savePath: /data/hzims/safeproduct/car + risk: + save-path: /data/hzims/file/safeproduct/pdf \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3143897..b111a12 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ org.springblade blade-system-api - 5.1.3.RELEASE + 5.1.3.RELEASE.fix1 org.springblade @@ -66,7 +66,7 @@ com.baomidou dynamic-datasource-spring-boot-starter - 3.3.2 + 3.5.0