update: safeproduct服务升级改造

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

@@ -17,11 +17,9 @@
 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.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.scheduling.annotation.EnableScheduling;
 
@@ -30,22 +28,15 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Chill
  */
-@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"})
-@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.**")
 @EnableScheduling
 @ComponentScan(basePackages = {"com.hnac.hzims.*"})
-public class AssetsApplication extends SpringBootServletInitializer {
+public class AssetsApplication {
 
 	public static void main(String[] args) {
-//		System.setProperty("nacos.standalone", "true");
 		BladeApplication.run(AssetsConstants.APP_NAME, AssetsApplication.class, args);
 	}
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-		return BladeApplication.createSpringApplicationBuilder(builder, AssetsConstants.APP_NAME, AssetsApplication.class);
-	}
-
 }
-

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java

@@ -17,9 +17,9 @@
 package com.hnac.hzims.safeproduct;
 
 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;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -28,17 +28,15 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Chill
  */
-@EnableBladeFeign
-@SpringCloudApplication
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@MapperScan(basePackages = {"com.hnac.hzims.*.**.mapper.**"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
 @EnableScheduling
-@MapperScan("com.hnac.hzims.*.**.mapper.**")
 @ComponentScan(basePackages = {"com.hnac.*"})
 public class SafeproductApplication {
 
-
 	public static void main(String[] args) {
 		BladeApplication.run(Constants.APP_NAME, SafeproductApplication.class, args);
 	}
-
 }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/feign/DangerSourceClient.java

@@ -4,7 +4,7 @@ import com.hnac.hzims.safeproduct.entity.DangerSourceEntity;
 import com.hnac.hzims.safeproduct.hazard.service.IDangerSourceService;
 import com.hnac.hzims.safeproduct.vo.SourceVO;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springblade.system.vo.CreateTableVO;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +33,6 @@ public class DangerSourceClient implements IDangerSourceClient {
 	@GetMapping(DETAILS)
 	public List<DangerSourceEntity> details(@RequestParam String[] ids) {
 		List<DangerSourceEntity> resp = service.listByIds(Arrays.asList(ids));
-
 		//未查到数据返回空集合
 		if (CollectionUtils.isEmpty(resp)) {
 			return new ArrayList<>();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarAnnualInspectionMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarAnnualInspectionEntity;
 import com.hnac.hzims.safeproduct.vo.CarAnnualInspectionPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -26,12 +27,13 @@ public interface CarAnnualInspectionMapper extends UserDataScopeBaseMapper<CarAn
      * @return 年检记录数据
      */
     @UserDataAuth
-    IPage<CarAnnualInspectionPageVO> getCarAnnualInspectionPage(IPage<CarAnnualInspectionPageVO> page, Map<String, Object> param);
+    IPage<CarAnnualInspectionPageVO> getCarAnnualInspectionPage(@Param("page") IPage<CarAnnualInspectionPageVO> page,
+                                                                @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月年检记录
      * @param month 当月
      * @return 当月年检记录数据表
      */
-    List<CarAnnualInspectionEntity> selectCarAnnualInspectionByMonth(String month);
+    List<CarAnnualInspectionEntity> selectCarAnnualInspectionByMonth(@Param("month")String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarCheckRecordMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarCheckRecordEntity;
 import com.hnac.hzims.safeproduct.vo.CarCheckRecordPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -26,12 +27,12 @@ public interface CarCheckRecordMapper extends UserDataScopeBaseMapper<CarCheckRe
      * @return 分页数据
      */
     @UserDataAuth
-    IPage<CarCheckRecordPageVO> getCarCheckRecordPage(IPage<CarCheckRecordPageVO> page, Map<String, Object> param);
+    IPage<CarCheckRecordPageVO> getCarCheckRecordPage(@Param("page") IPage<CarCheckRecordPageVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月车检记录
      * @param month 当月
      * @return 当月车检记录数据表
      */
-    List<CarCheckRecordEntity> selectCarCheckRecordByMonth(String month);
+    List<CarCheckRecordEntity> selectCarCheckRecordByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarCheckTemplateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarCheckTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -16,5 +17,5 @@ public interface CarCheckTemplateMapper extends BaseMapper<CarCheckTemplateEntit
      * @param param 参数
      * @return 分页
      */
-    IPage<CarCheckTemplateEntity> getCarCheckTemplatePage(IPage<CarCheckTemplateEntity> page, Map<String, Object> param);
+    IPage<CarCheckTemplateEntity> getCarCheckTemplatePage(@Param("page") IPage<CarCheckTemplateEntity> page, @Param("param") Map<String, Object> param);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarInsuranceMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarInsuranceEntity;
 import com.hnac.hzims.safeproduct.vo.CarInsurancePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -26,12 +27,12 @@ public interface CarInsuranceMapper extends UserDataScopeBaseMapper<CarInsurance
      * @return 车保记录数据
      */
     @UserDataAuth
-    IPage<CarInsurancePageVO> getCarInsurancePage(IPage<CarInsurancePageVO> page, Map<String, Object> param);
+    IPage<CarInsurancePageVO> getCarInsurancePage(@Param("page") IPage<CarInsurancePageVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月年保记录
      * @param month 当月
      * @return 当月年保记录数据表
      */
-    List<CarInsuranceEntity> selectCarInsuranceByMonth(String month);
+    List<CarInsuranceEntity> selectCarInsuranceByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.entity.CarMaintenanceEntity;
 import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarMaintenancePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface CarMaintenanceMapper extends UserDataScopeBaseMapper<CarMainten
      * @param carMaintenanceId 车辆维保记录id
      * @return 车辆维保记录详情VO类
      */
-    CarMaintenanceDetailVO getCarMaintenance(Long carMaintenanceId);
+    CarMaintenanceDetailVO getCarMaintenance(@Param("carMaintenanceId") Long carMaintenanceId);
 
     /**
      * 车辆维保记录数据页
@@ -34,12 +35,12 @@ public interface CarMaintenanceMapper extends UserDataScopeBaseMapper<CarMainten
      * @return 分页数据
      */
     @UserDataAuth
-    IPage<CarMaintenancePageVO> getCarMaintenancePage(IPage<CarMaintenancePageVO> page, Map<String, Object> param);
+    IPage<CarMaintenancePageVO> getCarMaintenancePage(@Param("page") IPage<CarMaintenancePageVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月车辆维保记录
      * @param month 当月
      * @return 当月车辆维保数据表
      */
-    List<CarMaintenanceEntity> selectCarMaintenanceByMonth(String month);
+    List<CarMaintenanceEntity> selectCarMaintenanceByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.dto.CarMilesYearDTO;
 import com.hnac.hzims.safeproduct.entity.CarEntity;
 import com.hnac.hzims.safeproduct.vo.CarMilesYearVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -28,7 +29,7 @@ public interface CarMapper extends UserDataScopeBaseMapper<CarEntity> {
      * @return 分页车辆数据
      */
     @UserDataAuth
-    IPage<CarMilesYearVO> selectCarByYear(IPage<CarMilesYearVO> page, String year, String unit);
+    IPage<CarMilesYearVO> selectCarByYear(@Param("page") IPage<CarMilesYearVO> page, @Param("year") String year, @Param("unit") String unit);
 
     /**
      * 查询车辆当年的月度里程数
@@ -37,12 +38,12 @@ public interface CarMapper extends UserDataScopeBaseMapper<CarEntity> {
      * @return 里程数列表
      */
     @UserDataAuth
-    List<CarMilesYearDTO> selectMilesByCar(List<String> carList, String year);
+    List<CarMilesYearDTO> selectMilesByCar(@Param("carList") List<String> carList, @Param("year") String year);
 
     /**
      * 查询车辆的里程数
      * @param plateNumber 车牌号
      * @return 里程数
      */
-    BigDecimal selectMilesByPlateNumber(String plateNumber);
+    BigDecimal selectMilesByPlateNumber(@Param("plateNumber") String plateNumber);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarUsedRecordMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.entity.CarUsedRecordEntity;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface CarUsedRecordMapper extends UserDataScopeBaseMapper<CarUsedReco
      * @param carUsedRecordId 用车记录id
      * @return 用车记录详情VO类
      */
-    CarUsedRecordDetailVO getCarUsedRecord(Long carUsedRecordId);
+    CarUsedRecordDetailVO getCarUsedRecord(@Param("carUsedRecordId") Long carUsedRecordId);
 
     /**
      * 用车记录页面
@@ -34,12 +35,12 @@ public interface CarUsedRecordMapper extends UserDataScopeBaseMapper<CarUsedReco
      * @return 分页数据
      */
     @UserDataAuth
-    IPage<CarUsedRecordPageVO> getCarUsedRecordPage(IPage<CarUsedRecordPageVO> page, Map<String, Object> param);
+    IPage<CarUsedRecordPageVO> getCarUsedRecordPage(@Param("page") IPage<CarUsedRecordPageVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月用车记录
      * @param month 当月
      * @return 当月用车记录数据表
      */
-    List<CarUsedRecordEntity> selectCarUsedRecordByMonth(String month);
+    List<CarUsedRecordEntity> selectCarUsedRecordByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckMonthMapper.java

@@ -15,7 +15,7 @@ public interface CheckMonthMapper extends UserDataScopeBaseMapper<CheckMonthEnti
 	 *
 	 * @return
 	 */
-	IPage<CheckMonthEntity> pageNotDataScope(IPage page, @Param("req") CheckMonthEntity req);
+	IPage<CheckMonthEntity> pageNotDataScope(@Param("page") IPage page, @Param("req") CheckMonthEntity req);
 
 	/**
 	 * 分页查询安全生产会议次数
@@ -23,5 +23,5 @@ public interface CheckMonthMapper extends UserDataScopeBaseMapper<CheckMonthEnti
 	 * @param req
 	 * @return
 	 */
-	IPage<CheckMonthEntity> listconferenceScope(IPage<CheckMonthEntity> objectPage, @Param("req") CheckMonthEntity req);
+	IPage<CheckMonthEntity> listconferenceScope(@Param("objectPage") IPage<CheckMonthEntity> objectPage, @Param("req") CheckMonthEntity req);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CheckQuarterMapper.java

@@ -15,6 +15,6 @@ public interface CheckQuarterMapper extends UserDataScopeBaseMapper<CheckQuarter
 	 *
 	 * @return
 	 */
-	IPage<CheckQuarterEntity> pageNotDataScope(IPage page, @Param("req") CheckQuarterEntity req);
+	IPage<CheckQuarterEntity> pageNotDataScope(@Param("page") IPage page, @Param("req") CheckQuarterEntity req);
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.mapper;
 import com.hnac.hzims.safeproduct.dto.ConferenceExportDTO;
 import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,5 +26,6 @@ public interface ConferencePlanMapper extends UserDataScopeBaseMapper<Conference
      * @return 会议记录列表
      */
     @UserDataAuth
-    List<ConferenceExportDTO> getConferenceByUnitAndDate(String unit, String startTime, String endTime);
+    List<ConferenceExportDTO> getConferenceByUnitAndDate(@Param("unit") String unit, @Param("startTime") String startTime,
+                                                         @Param("endTime") String endTime);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.entity.ConferenceRecordEntity;
 import com.hnac.hzims.safeproduct.vo.ConferenceRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.ConferenceRecordVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface ConferenceRecordMapper extends UserDataScopeBaseMapper<Conferen
      * @param id 会议记录id
      * @return 会议记录表VO类
      */
-    ConferenceRecordDetailVO getConferenceRecordDetailById(Long id);
+    ConferenceRecordDetailVO getConferenceRecordDetailById(@Param("id") Long id);
 
     /**
      * 获取会议记录分页
@@ -34,12 +35,12 @@ public interface ConferenceRecordMapper extends UserDataScopeBaseMapper<Conferen
      * @return 会议记录分页
      */
     @UserDataAuth
-    IPage<ConferenceRecordVO> getConferenceRecordPage(IPage<ConferenceRecordVO> page, Map<String, Object> param);
+    IPage<ConferenceRecordVO> getConferenceRecordPage(@Param("page") IPage<ConferenceRecordVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月会议记录
      * @param month 当月
      * @return 当月会议数据表
      */
-    List<ConferenceRecordEntity> selectConferenceByMonth(String month);
+    List<ConferenceRecordEntity> selectConferenceByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/DangerSourceLevelRecordMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.DangerSourceLevelRecordEntity;
 import com.hnac.hzims.safeproduct.vo.DangerSourceLevelRecordVO;
@@ -14,6 +13,6 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
  */
 public interface DangerSourceLevelRecordMapper extends UserDataScopeBaseMapper<DangerSourceLevelRecordEntity> {
 
-	IPage<DangerSourceLevelRecordVO> pageCondition(@Param("page") DangerSourceLevelRecordEntity page, IPage query);
+	IPage<DangerSourceLevelRecordVO> pageCondition(@Param("page") DangerSourceLevelRecordEntity page, @Param("query") IPage query);
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/DangerSourcePositionMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.DangerSourcePositionEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/EmergencyPlanMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/EmergencyPlanTypeMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanTypeEntity;
@@ -14,6 +13,6 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
  **/
 public interface EmergencyPlanTypeMapper extends UserDataScopeBaseMapper<EmergencyPlanTypeEntity> {
 
-	IPage<EmergencyPlanTypeVO> pageCondition(@Param("page") EmergencyPlanTypeListDTO req, IPage query);
+	IPage<EmergencyPlanTypeVO> pageCondition(@Param("page") EmergencyPlanTypeListDTO req, @Param("query") IPage query);
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygienePlanMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.HygienePlanEntity;
 import com.hnac.hzims.safeproduct.vo.HygieneMonthVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -24,7 +25,7 @@ public interface HygienePlanMapper extends UserDataScopeBaseMapper<HygienePlanEn
      * @return 当月的卫生自查总数据
      */
     @UserDataAuth
-    IPage<HygieneMonthVO> selectByMonth(IPage<HygieneMonthVO> page, String unit, String month);
+    IPage<HygieneMonthVO> selectByMonth(@Param("page") IPage<HygieneMonthVO> page, @Param("unit") String unit, @Param("month") String month);
 
     /**
      * 查询当月各单位已完成的卫生自查数据
@@ -34,5 +35,6 @@ public interface HygienePlanMapper extends UserDataScopeBaseMapper<HygienePlanEn
      * @return 当月的已完成数据
      */
     @UserDataAuth
-    IPage<HygieneMonthVO> selectFinishedDataByMonth(IPage<HygieneMonthVO> page, String unit, String month);
+    IPage<HygieneMonthVO> selectFinishedDataByMonth(@Param("page") IPage<HygieneMonthVO> page, @Param("unit") String unit,
+                                                    @Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.entity.HygieneRecordEntity;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface HygieneRecordMapper extends UserDataScopeBaseMapper<HygieneReco
      * @param id 卫生自查记录id
      * @return 卫生自查记录详情VO类
      */
-    HygieneRecordDetailVO getRecordDetail(Long id);
+    HygieneRecordDetailVO getRecordDetail(@Param("id") Long id);
 
     /**
      * 卫生自查记录页面
@@ -34,12 +35,12 @@ public interface HygieneRecordMapper extends UserDataScopeBaseMapper<HygieneReco
      * @return 记录数据页
      */
     @UserDataAuth
-    IPage<HygieneRecordPageVO> recordPage(IPage<HygieneRecordPageVO> page, Map<String, Object> param);
+    IPage<HygieneRecordPageVO> recordPage(@Param("page") IPage<HygieneRecordPageVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月卫生自查记录
      * @param month 当月
      * @return 当月卫生自查数据表
      */
-    List<HygieneRecordEntity> selectHygieneByMonth(String month);
+    List<HygieneRecordEntity> selectHygieneByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneTemplateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.HygieneTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -21,5 +22,5 @@ public interface HygieneTemplateMapper extends BaseMapper<HygieneTemplateEntity>
      * @param page 分页类
      * @return 页面
      */
-    IPage<HygieneTemplateEntity> getHygieneTemplatePage(IPage<HygieneTemplateEntity> page, Map<String, Object> param);
+    IPage<HygieneTemplateEntity> getHygieneTemplatePage(@Param("page") IPage<HygieneTemplateEntity> page, @Param("param") Map<String, Object> param);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ImsMonAlarmInfoMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.ImsMonAlarmInfoEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ImsMonCameraInfoMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.ImsMonCameraInfoEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.java

@@ -30,7 +30,7 @@ public interface RehearsalPlanMapper extends UserDataScopeBaseMapper<RehearsalPl
      * @return 当月的演练总数据
      */
     @UserDataAuth
-    IPage<RehearsalMonthVO> selectByMonth(IPage<RehearsalMonthVO> page, String unit, String month);
+    IPage<RehearsalMonthVO> selectByMonth(@Param("page") IPage<RehearsalMonthVO> page, @Param("unit") String unit, @Param("month") String month);
 
     /**
      * 查询当月各单位已完成的演练数据
@@ -40,7 +40,8 @@ public interface RehearsalPlanMapper extends UserDataScopeBaseMapper<RehearsalPl
      * @return 当月的已完成数据
      */
     @UserDataAuth
-    IPage<RehearsalMonthVO> selectFinishedDataByMonth(IPage<RehearsalMonthVO> page, String unit, String month);
+    IPage<RehearsalMonthVO> selectFinishedDataByMonth(@Param("page") IPage<RehearsalMonthVO> page, @Param("unit") String unit,
+                                                      @Param("month") String month);
 
     /**
      * 查询当年的所有单位
@@ -50,7 +51,7 @@ public interface RehearsalPlanMapper extends UserDataScopeBaseMapper<RehearsalPl
      * @return 年度单位数据
      */
     @UserDataAuth
-    IPage<RehearsalYearVO> selectUnitByYear(IPage<RehearsalYearVO> page, String unit, @Param("year") String year);
+    IPage<RehearsalYearVO> selectUnitByYear(@Param("page") IPage<RehearsalYearVO> page, @Param("unit") String unit, @Param("year") String year);
 
     /**
      * 查询各单位全年已完成的演练数据
@@ -69,5 +70,6 @@ public interface RehearsalPlanMapper extends UserDataScopeBaseMapper<RehearsalPl
      * @return 演练数据列表
      */
     @UserDataAuth
-    List<RehearsalExportDTO> getRehearsalByUnitAndDate(String unit, String startTime, String endTime);
+    List<RehearsalExportDTO> getRehearsalByUnitAndDate(@Param("unit") String unit, @Param("startTime") String startTime,
+                                                       @Param("endTime") String endTime);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalRecordMapper.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
 import com.hnac.hzims.safeproduct.vo.RehearsalRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.RehearsalRecordlVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface RehearsalRecordMapper extends UserDataScopeBaseMapper<Rehearsal
      * @param id 演练记录id
      * @return 演练记录表VO类
      */
-    RehearsalRecordDetailVO getRecordDetailVOById(Long id);
+    RehearsalRecordDetailVO getRecordDetailVOById(@Param("id") Long id);
 
     /**
      * 获取演练记录分页
@@ -34,12 +35,12 @@ public interface RehearsalRecordMapper extends UserDataScopeBaseMapper<Rehearsal
      * @return 演练记录分页
      */
     @UserDataAuth
-    IPage<RehearsalRecordlVO> getRehearsalRecordPage(IPage<RehearsalRecordlVO> page, Map<String, Object> param);
+    IPage<RehearsalRecordlVO> getRehearsalRecordPage(@Param("page") IPage<RehearsalRecordlVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月演练记录
      * @param month 当月
      * @return 当月演练数据表
      */
-    List<RehearsalRecordEntity> selectRehearsalByMonth(String month);
+    List<RehearsalRecordEntity> selectRehearsalByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SafetyToolMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.SafetyToolEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SafetyToolRecheckMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.dto.SafetyToolRecheckListDTO;
 import com.hnac.hzims.safeproduct.entity.SafetyToolRecheckEntity;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SafetyToolTypeMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.SafetyToolTypeEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SpecialDeviceInspectionMapper.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.SpecialDeviceInspectionEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,12 +26,13 @@ public interface SpecialDeviceInspectionMapper extends UserDataScopeBaseMapper<S
      * @return 设备检验记录数据
      */
     @UserDataAuth
-    IPage<SpecialDeviceInspectionEntity> getInspectionPage(IPage<SpecialDeviceInspectionEntity> page, Map<String, Object> param);
+    IPage<SpecialDeviceInspectionEntity> getInspectionPage(@Param("page") IPage<SpecialDeviceInspectionEntity> page,
+                                                           @Param("param") Map<String, Object> param);
 
     /**
      * 获取设备相关检验记录
      * @param deviceId 设备id
      * @return 设备检验记录列表
      */
-    List<SpecialDeviceInspectionEntity> getRefDeviceInspection(Long deviceId);
+    List<SpecialDeviceInspectionEntity> getRefDeviceInspection(@Param("deviceId") Long deviceId);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SystemFileMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.SystemFileEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/SystemFileTypeMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.dto.SystemFileTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileTypeEntity;
@@ -14,6 +13,6 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
  **/
 public interface SystemFileTypeMapper extends UserDataScopeBaseMapper<SystemFileTypeEntity> {
 
-	IPage<SystemFileTypeVO> pageCondition(@Param("page") SystemFileTypeListDTO page, IPage query);
+	IPage<SystemFileTypeVO> pageCondition(@Param("page") SystemFileTypeListDTO page, @Param("query") IPage query);
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.dto.TestDTO;
 import com.hnac.hzims.safeproduct.entity.TestEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -25,7 +26,7 @@ public interface TestMapper extends UserDataScopeBaseMapper<TestEntity> {
      * @return 考试记录名称列表
      */
     @UserDataAuth
-    List<TestDTO> getTestNameList(String trainPlanId);
+    List<TestDTO> getTestNameList(@Param("trainPlanId") String trainPlanId);
 
     /**
      * 考试记录分页
@@ -34,12 +35,12 @@ public interface TestMapper extends UserDataScopeBaseMapper<TestEntity> {
      * @return 考试记录数据
      */
     @UserDataAuth
-    IPage<TestEntity> testPage(IPage<TestEntity> page, Map<String, Object> param);
+    IPage<TestEntity> testPage(@Param("page") IPage<TestEntity> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月考试记录
      * @param month 当月
      * @return 当月考试记录
      */
-    List<TestEntity> selectTestByMonth(String month);
+    List<TestEntity> selectTestByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestScoreMapper.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.mapper;
 import com.hnac.hzims.safeproduct.entity.TestScoreEntity;
 import com.hnac.hzims.safeproduct.vo.TestScoreVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 import java.util.List;
@@ -22,5 +23,5 @@ public interface TestScoreMapper extends UserDataScopeBaseMapper<TestScoreEntity
      * @param name 姓名
      * @return 考试成绩列表
      */
-    List<TestScoreVO> testScoreList(Long testId, String name);
+    List<TestScoreVO> testScoreList(@Param("testId") Long testId, @Param("name") String name);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.java

@@ -6,6 +6,7 @@ import com.hnac.hzims.safeproduct.entity.TrainPlanEntity;
 import com.hnac.hzims.safeproduct.vo.TrainMonthVO;
 import com.hnac.hzims.safeproduct.vo.TrainYearVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -29,7 +30,7 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 当月培训计划总数
      */
     @UserDataAuth
-    IPage<TrainMonthVO> selectByMonth(IPage<TrainMonthVO> page, String unit, String month);
+    IPage<TrainMonthVO> selectByMonth(@Param("page") IPage<TrainMonthVO> page, @Param("unit") String unit, @Param("month") String month);
 
     /**
      * 查询当月各单位已完成的培训计划数据
@@ -39,7 +40,7 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 当月已完成培训计划数
      */
     @UserDataAuth
-    IPage<TrainMonthVO> selectFinishedDataByMonth(IPage<TrainMonthVO> page1, String unit, String month);
+    IPage<TrainMonthVO> selectFinishedDataByMonth(@Param("page1") IPage<TrainMonthVO> page1, @Param("unit") String unit, @Param("month") String month);
 
     /**
      * 查询当年的所有单位
@@ -49,7 +50,7 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 年度单位数据
      */
     @UserDataAuth
-    IPage<TrainYearVO> selectUnitByYear(IPage<TrainYearVO> page, String unit, String year);
+    IPage<TrainYearVO> selectUnitByYear(@Param("page") IPage<TrainYearVO> page, @Param("unit") String unit, @Param("year") String year);
 
     /**
      * 查询各单位全年已完成的培训计划数
@@ -58,7 +59,7 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 单位各月的培训计划数
      */
     @UserDataAuth
-    List<AnalysisYearDTO> selectFinishedDataByUnit(List<String> unitList, String year);
+    List<AnalysisYearDTO> selectFinishedDataByUnit(@Param("unitList") List<String> unitList, @Param("year") String year);
 
     /**
      * 培训计划分页
@@ -67,7 +68,7 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 培训计划数据
      */
     @UserDataAuth
-    IPage<TrainPlanEntity> trainPlanPage(IPage<TrainPlanEntity> page, Map<String, Object> param);
+    IPage<TrainPlanEntity> trainPlanPage(@Param("page") IPage<TrainPlanEntity> page, @Param("param") Map<String, Object> param);
 
     /**
      * 根据单位和计划时间查询培训计划数据
@@ -77,5 +78,6 @@ public interface TrainPlanMapper extends UserDataScopeBaseMapper<TrainPlanEntity
      * @return 培训计划列表
      */
     @UserDataAuth
-    List<TrainPlanEntity> selectListByUnitAndDate(String unit, String startTime, String endTime);
+    List<TrainPlanEntity> selectListByUnitAndDate(@Param("unit") String unit, @Param("startTime") String startTime,
+                                                  @Param("endTime") String endTime);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainRecordMapper.java

@@ -6,6 +6,7 @@ import com.hnac.hzims.safeproduct.entity.TrainRecordEntity;
 import com.hnac.hzims.safeproduct.vo.TrainRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.TrainRecordVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -27,14 +28,14 @@ public interface TrainRecordMapper extends UserDataScopeBaseMapper<TrainRecordEn
      * @return 培训记录名称列表
      */
     @UserDataAuth
-    List<TrainRecordDTO> getTrainRecordNameList(String trainPlanId);
+    List<TrainRecordDTO> getTrainRecordNameList(@Param("trainPlanId") String trainPlanId);
 
     /**
      * 查询培训记录表详情
      * @param id 培训记录id
      * @return 培训记录表VO类
      */
-    TrainRecordDetailVO getTrainRecordDetailById(Long id);
+    TrainRecordDetailVO getTrainRecordDetailById(@Param("id") Long id);
 
     /**
      * 培训记录分页
@@ -43,12 +44,12 @@ public interface TrainRecordMapper extends UserDataScopeBaseMapper<TrainRecordEn
      * @return 培训记录数据
      */
     @UserDataAuth
-    IPage<TrainRecordVO> trainRecordPage(IPage<TrainRecordVO> page, Map<String, Object> param);
+    IPage<TrainRecordVO> trainRecordPage(@Param("page") IPage<TrainRecordVO> page, @Param("param") Map<String, Object> param);
 
     /**
      * 查询当月培训记录
      * @param month 当月
      * @return 当月培训记录
      */
-    List<TrainRecordEntity> selectTrainByMonth(String month);
+    List<TrainRecordEntity> selectTrainByMonth(@Param("month") String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/EstimateServiceImpl.java

@@ -48,7 +48,7 @@ public class EstimateServiceImpl extends BaseServiceImpl<EstimateMapper, RiskEst
     @Override
     public boolean saveEstimate(RiskEstimate entity) {
         // 检查站点年度评估任务是否存在
-        int count = this.count(Wrappers.<RiskEstimate>lambdaQuery()
+        long count = this.count(Wrappers.<RiskEstimate>lambdaQuery()
                 .eq(RiskEstimate::getStationCode,entity.getStationCode())
                 .eq(RiskEstimate::getEstimateYear,entity.getEstimateYear()));
         if(count > 0){

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/controller/RiskHazardsScreeningController.java

@@ -7,9 +7,9 @@ import com.hnac.hzims.safeproduct.riskhazards.entity.RiskHazardsScreening;
 import com.hnac.hzims.safeproduct.riskhazards.service.IRiskHazardsScreeningService;
 import com.hnac.hzims.safeproduct.riskhazards.vo.RiskHazardsScreeningVo;
 import com.hnac.hzims.safeproduct.wrapper.RiskHazardsScreeningWrapper;
+import com.hnac.hzinfo.cache.constant.CacheNames;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
-import org.springblade.common.cache.CacheNames;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -136,7 +136,7 @@ public class RiskHazardsScreeningController extends BladeController implements C
     @ApiOperation(value = "详情", notes = "传入riskHazardsScreening")
     public R count() {
         LambdaQueryWrapper<RiskHazardsScreening> wrapper=new LambdaQueryWrapper<>();
-        int counts=riskHazardsScreeningService.count(wrapper);
+        long counts=riskHazardsScreeningService.count(wrapper);
         return R.data(counts);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IAccidentService.java

@@ -1,15 +1,16 @@
 package com.hnac.hzims.safeproduct.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.AccidentDTO;
 import com.hnac.hzims.safeproduct.entity.AccidentEntity;
 import com.hnac.hzims.safeproduct.statistic.vo.RiskDangerAccidentMonthCountVO;
-import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
 
 /**
  * @author hx
  */
-public interface IAccidentService extends BaseService<AccidentEntity> {
+public interface IAccidentService extends IService<AccidentEntity> {
+
     List<RiskDangerAccidentMonthCountVO> getAccidentMonthTrend(AccidentDTO req);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckCompanyService.java

@@ -1,13 +1,9 @@
 package com.hnac.hzims.safeproduct.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.CheckCompanyDTO;
-import com.hnac.hzims.safeproduct.dto.CheckQuarterDTO;
 import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity;
-import com.hnac.hzims.safeproduct.entity.CheckQuarterEntity;
 import com.hnac.hzims.safeproduct.vo.CheckCompanyVo;
-import com.hnac.hzims.safeproduct.vo.CheckQuarterVo;
-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;
@@ -15,7 +11,7 @@ import org.springblade.core.tool.api.R;
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckCompanyService extends BaseService<CheckCompanyEntity> {
+public interface ICheckCompanyService extends IService<CheckCompanyEntity> {
 
 	boolean doSave(CheckCompanyDTO req);
 
@@ -26,5 +22,4 @@ public interface ICheckCompanyService extends BaseService<CheckCompanyEntity> {
 	R<CheckCompanyVo> detail(Long id);
 
 	R<BladePage<CheckCompanyVo>> pageCondition(CheckCompanyEntity req, Query query);
-
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckItemInstanceService.java

@@ -1,18 +1,11 @@
 package com.hnac.hzims.safeproduct.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hnac.hzims.safeproduct.dto.CheckItemDTO;
-import com.hnac.hzims.safeproduct.entity.CheckItemEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity;
-import com.hnac.hzims.safeproduct.vo.CheckItemVo;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
 
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckItemInstanceService extends BaseService<CheckItemInstanceEntity> {
-
+public interface ICheckItemInstanceService extends IService<CheckItemInstanceEntity> {
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckItemService.java

@@ -1,24 +1,22 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.CheckItemDTO;
-import com.hnac.hzims.safeproduct.dto.CheckMonthDTO;
 import com.hnac.hzims.safeproduct.dto.CheckQueryItemDTO;
 import com.hnac.hzims.safeproduct.entity.CheckItemEntity;
 import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity;
 import com.hnac.hzims.safeproduct.vo.CheckItemVo;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckItemService extends BaseService<CheckItemEntity> {
+public interface ICheckItemService extends IService<CheckItemEntity> {
 
 	boolean doSave(CheckItemDTO req);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckMonthService.java

@@ -2,17 +2,17 @@ package com.hnac.hzims.safeproduct.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.safeproduct.dto.CheckMonthDTO;
 import com.hnac.hzims.safeproduct.entity.CheckMonthEntity;
 import com.hnac.hzims.safeproduct.vo.CheckMonthVo;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckMonthService extends BaseService<CheckMonthEntity> {
+public interface ICheckMonthService extends IService<CheckMonthEntity> {
 
 	R doSave(CheckMonthDTO req);
 
@@ -26,7 +26,6 @@ public interface ICheckMonthService extends BaseService<CheckMonthEntity> {
 
 	R<IPage<CheckMonthVo>> pageNotDataScope(CheckMonthEntity req, Query query);
 
-
 	/**
 	 * 分页查询安全生产会议次数
 	 * @param req

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckNoticeService.java

@@ -1,20 +1,17 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hnac.hzims.safeproduct.dto.CheckItemDTO;
-import com.hnac.hzims.safeproduct.dto.CheckMonthDTO;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.CheckNoticeDTO;
-import com.hnac.hzims.safeproduct.dto.CheckQuarterDTO;
 import com.hnac.hzims.safeproduct.entity.CheckNoticeEntity;
 import com.hnac.hzims.safeproduct.vo.CheckNoticeVo;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckNoticeService extends BaseService<CheckNoticeEntity> {
+public interface ICheckNoticeService extends IService<CheckNoticeEntity> {
 
 	boolean doSave(CheckNoticeDTO req);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICheckQuarterService.java

@@ -1,17 +1,17 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.CheckQuarterDTO;
 import com.hnac.hzims.safeproduct.entity.CheckQuarterEntity;
 import com.hnac.hzims.safeproduct.vo.CheckQuarterVo;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 /**
  * Created by Sam Huang 2022/5/6 8:28
  */
-public interface ICheckQuarterService extends BaseService<CheckQuarterEntity> {
+public interface ICheckQuarterService extends IService<CheckQuarterEntity> {
 
 	R doSave(CheckQuarterDTO req);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IEmergencyPlanService.java

@@ -1,10 +1,10 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanListDTO;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanEntity;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanVO;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
@@ -12,7 +12,7 @@ import org.springblade.core.tool.api.R;
  * @author xiashandong
  * @created 2020/9/9 14:39
  **/
-public interface IEmergencyPlanService extends BaseService<EmergencyPlanEntity> {
+public interface IEmergencyPlanService extends IService<EmergencyPlanEntity> {
 
 	R<EmergencyPlanVO> detail(Long id);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IEmergencyPlanTypeService.java

@@ -1,21 +1,20 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanTypeDTO;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanTypeEntity;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanTypeTreeVO;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanTypeVO;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
-
 /**
  * @author xiashandong
  * @created 2020/9/9 14:39
  **/
-public interface IEmergencyPlanTypeService extends BaseService<EmergencyPlanTypeEntity> {
+public interface IEmergencyPlanTypeService extends IService<EmergencyPlanTypeEntity> {
 
 	boolean remove(Long id);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IImsMonAlarmInfoService.java

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

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IImsMonCameraInfoService.java

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

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewService.java

@@ -1,10 +1,11 @@
 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
  */
-public interface IReviewService extends BaseService<ReviewEntity> {
+public interface IReviewService extends IService<ReviewEntity> {
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IReviewStandardService.java

@@ -1,11 +1,10 @@
 package com.hnac.hzims.safeproduct.service;
 
-import com.hnac.hzims.safeproduct.entity.ReviewEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.entity.ReviewStandardEntity;
-import org.springblade.core.mp.base.BaseService;
 
 /**
  * @author hx
  */
-public interface IReviewStandardService extends BaseService<ReviewStandardEntity> {
+public interface IReviewStandardService extends IService<ReviewStandardEntity> {
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolService.java

@@ -1,11 +1,11 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.SafetyToolBatchRecheckDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolDTO;
 import com.hnac.hzims.safeproduct.entity.SafetyToolEntity;
 import com.hnac.hzims.safeproduct.vo.SafetyToolVO;
-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;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author xiashandong
  * @created 2020/8/27 17:19
  **/
-public interface ISafetyToolService extends BaseService<SafetyToolEntity> {
+public interface ISafetyToolService extends IService<SafetyToolEntity> {
 
 	R doSave(SafetyToolEntity req);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolTypeService.java

@@ -1,12 +1,12 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeBatchConfigDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.SafetyToolTypeEntity;
 import com.hnac.hzims.safeproduct.vo.SafetyToolTypeVO;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Map;
  *
  * @author Chill
  */
-public interface ISafetyToolTypeService extends BaseService<SafetyToolTypeEntity> {
+public interface ISafetyToolTypeService extends IService<SafetyToolTypeEntity> {
 
 	long doSave(SafetyToolTypeDTO req);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISystemFileService.java

@@ -1,10 +1,10 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.SystemFileListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileEntity;
 import com.hnac.hzims.safeproduct.vo.SystemFileVO;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
@@ -12,7 +12,7 @@ import org.springblade.core.tool.api.R;
  * @author xiashandong
  * @created 2020/9/8 15:12
  **/
-public interface ISystemFileService extends BaseService<SystemFileEntity> {
+public interface ISystemFileService extends IService<SystemFileEntity> {
 
 	R<SystemFileVO> detail(Long id);
 
@@ -24,5 +24,4 @@ public interface ISystemFileService extends BaseService<SystemFileEntity> {
 	 * @return
 	 */
 	R submitApproved(SystemFileListDTO req);
-
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISystemFileTypeService.java

@@ -1,11 +1,11 @@
 package com.hnac.hzims.safeproduct.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.SystemFileTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileTypeEntity;
 import com.hnac.hzims.safeproduct.vo.SystemFileTypeTreeVO;
 import com.hnac.hzims.safeproduct.vo.SystemFileTypeVO;
-import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
@@ -13,7 +13,7 @@ import org.springblade.core.tool.api.R;
  * @author xiashandong
  * @created 2020/9/7 16:21
  **/
-public interface ISystemFileTypeService extends BaseService<SystemFileTypeEntity> {
+public interface ISystemFileTypeService extends IService<SystemFileTypeEntity> {
 
 	boolean remove(Long id);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/SafeEquipmentTrialService.java

@@ -1,11 +1,10 @@
 package com.hnac.hzims.safeproduct.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.dto.SafeEquipmentDTO;
 import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO;
 import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity;
 import com.hnac.hzims.safeproduct.vo.SafeEquipmentTrialVO;
-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;
@@ -15,7 +14,7 @@ import java.util.List;
 /**
  * 设备试验接口
  */
-public interface SafeEquipmentTrialService extends BaseService<SafeEquipmentTrialEntity> {
+public interface SafeEquipmentTrialService extends IService<SafeEquipmentTrialEntity> {
 
 	R<BladePage<SafeEquipmentTrialVO>> pageCondition(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query);
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/AccidentServiceImpl.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.feign.IStationClient;
 import com.hnac.hzims.safeproduct.dto.AccidentDTO;
@@ -11,7 +12,6 @@ import com.hnac.hzims.safeproduct.service.IAccidentService;
 import com.hnac.hzims.safeproduct.statistic.vo.RiskDangerAccidentMonthCountVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -26,7 +26,7 @@ import java.util.Optional;
 @Service
 @AllArgsConstructor
 @Slf4j
-public class AccidentServiceImpl extends BaseServiceImpl<AccidentMapper, AccidentEntity> implements IAccidentService {
+public class AccidentServiceImpl extends ServiceImpl<AccidentMapper, AccidentEntity> implements IAccidentService {
     private final IStationClient stationClient;
 
     @Override

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java

@@ -1,7 +1,6 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +17,7 @@ import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarCheckItemServiceImpl.java

@@ -1,12 +1,12 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.CarCheckItemEntity;
 import com.hnac.hzims.safeproduct.mapper.CarCheckItemMapper;
 import com.hnac.hzims.safeproduct.service.ICarCheckItemService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarCheckRecordServiceImpl.java

@@ -1,7 +1,6 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java

@@ -1,7 +1,6 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +16,7 @@ import com.hnac.hzims.safeproduct.vo.CarInsurancePageVO;
 import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +21,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckCompanyServiceImpl.java

@@ -5,6 +5,7 @@ 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.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.CheckCompanyDTO;
 import com.hnac.hzims.safeproduct.entity.CheckCompanyEntity;
 import com.hnac.hzims.safeproduct.entity.CheckItemEntity;
@@ -17,7 +18,6 @@ import com.hnac.hzims.safeproduct.wrapper.CheckCompanyWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -31,14 +31,13 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
 /**
  * Created by Sam Huang 2022/5/6 8:23
  */
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckCompanyServiceImpl extends BaseServiceImpl<CheckCompanyMapper, CheckCompanyEntity> implements ICheckCompanyService {
+public class CheckCompanyServiceImpl extends ServiceImpl<CheckCompanyMapper, CheckCompanyEntity> implements ICheckCompanyService {
 
     private final CheckCompanyMapper CheckCompanyMapper;
 
@@ -119,7 +118,7 @@ public class CheckCompanyServiceImpl extends BaseServiceImpl<CheckCompanyMapper,
     @Override
     public boolean doDelete(String ids) {
         List<Long> list = Func.toLongList(ids);
-        boolean result = deleteLogic(list);
+        boolean result = removeByIds(list);
         if (result) {
             list.forEach(id -> {
                 QueryWrapper<CheckItemInstanceEntity> queryMapper = new QueryWrapper<>();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemInstanceServiceImpl.java

@@ -1,20 +1,19 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity;
 import com.hnac.hzims.safeproduct.mapper.CheckItemInstanceMapper;
 import com.hnac.hzims.safeproduct.service.ICheckItemInstanceService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-
 /**
  * Created by Sam Huang 2022/5/6 8:23
  */
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckItemInstanceServiceImpl extends BaseServiceImpl<CheckItemInstanceMapper, CheckItemInstanceEntity> implements ICheckItemInstanceService {
+public class CheckItemInstanceServiceImpl extends ServiceImpl<CheckItemInstanceMapper, CheckItemInstanceEntity> implements ICheckItemInstanceService {
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.operational.duty.dto.ChangeShiftsReqDTO;
 import com.hnac.hzims.operational.duty.dto.ChangeShiftsRspDTO;
 import com.hnac.hzims.operational.duty.feign.IDutyRecClient;
@@ -28,9 +30,7 @@ import com.hnac.hzims.vo.SafeCheckStatisticVO;
 import com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.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;
@@ -53,14 +53,13 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
-
 /**
  * Created by Sam Huang 2022/5/6 8:23
  */
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, CheckItemEntity> implements ICheckItemService {
+public class CheckItemServiceImpl extends ServiceImpl<CheckItemMapper, CheckItemEntity> implements ICheckItemService {
 
 	private final CheckItemMapper checkItemMapper;
 
@@ -176,7 +175,7 @@ public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, Check
 			CheckItemEntity entity = getById(id);
 			updateParentScore(entity, true);
 		});
-		return deleteLogic(Func.toLongList(ids));
+		return removeByIds(Func.toLongList(ids));
 	}
 
 	@Override

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckMonthServiceImpl.java

@@ -5,6 +5,7 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.CheckMonthDTO;
 import com.hnac.hzims.safeproduct.entity.CheckItemEntity;
 import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity;
@@ -16,7 +17,6 @@ import com.hnac.hzims.safeproduct.vo.CheckMonthVo;
 import com.hnac.hzims.safeproduct.wrapper.CheckMonthWrapper;
 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.tool.api.R;
@@ -35,7 +35,7 @@ import java.util.List;
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckMonthServiceImpl extends BaseServiceImpl<CheckMonthMapper, CheckMonthEntity> implements ICheckMonthService {
+public class CheckMonthServiceImpl extends ServiceImpl<CheckMonthMapper, CheckMonthEntity> implements ICheckMonthService {
 
 	private final CheckMonthMapper checkMonthMapper;
 
@@ -104,7 +104,7 @@ public class CheckMonthServiceImpl extends BaseServiceImpl<CheckMonthMapper, Che
 	@Transactional(rollbackFor = Exception.class)
 	public boolean doDelete(String ids) {
 		List<Long> list = Func.toLongList(ids);
-		boolean result = deleteLogic(list);
+		boolean result = removeByIds(list);
 		if (result) {
 			list.forEach(id -> {
 				QueryWrapper<CheckItemInstanceEntity> queryMapper = new QueryWrapper<>();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckNoticeServiceImpl.java

@@ -3,6 +3,8 @@ package com.hnac.hzims.safeproduct.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.message.MessageConstants;
 import com.hnac.hzims.message.dto.AppPushDto;
 import com.hnac.hzims.message.dto.WsPushDto;
@@ -16,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.apache.commons.lang.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -33,14 +34,13 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-
 /**
  * Created by Sam Huang 2022/5/6 8:23
  */
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckNoticeServiceImpl extends BaseServiceImpl<CheckNoticeMapper, CheckNoticeEntity> implements ICheckNoticeService {
+public class CheckNoticeServiceImpl extends ServiceImpl<CheckNoticeMapper, CheckNoticeEntity> implements ICheckNoticeService {
 
 	private final CheckNoticeMapper CheckNoticeMapper;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckQuarterServiceImpl.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.CheckQuarterDTO;
 import com.hnac.hzims.safeproduct.entity.CheckItemEntity;
 import com.hnac.hzims.safeproduct.entity.CheckItemInstanceEntity;
-import com.hnac.hzims.safeproduct.entity.CheckMonthEntity;
 import com.hnac.hzims.safeproduct.entity.CheckQuarterEntity;
 import com.hnac.hzims.safeproduct.mapper.CheckQuarterMapper;
 import com.hnac.hzims.safeproduct.service.ICheckItemInstanceService;
@@ -16,7 +16,6 @@ import com.hnac.hzims.safeproduct.vo.CheckQuarterVo;
 import com.hnac.hzims.safeproduct.wrapper.CheckQuarterWrapper;
 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.tool.api.R;
@@ -28,14 +27,13 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Created by Sam Huang 2022/5/6 8:23
  */
 @Service
 @AllArgsConstructor
 @Slf4j
-public class CheckQuarterServiceImpl extends BaseServiceImpl<CheckQuarterMapper, CheckQuarterEntity> implements ICheckQuarterService {
+public class CheckQuarterServiceImpl extends ServiceImpl<CheckQuarterMapper, CheckQuarterEntity> implements ICheckQuarterService {
 
 	private final CheckQuarterMapper CheckQuarterMapper;
 
@@ -101,7 +99,7 @@ public class CheckQuarterServiceImpl extends BaseServiceImpl<CheckQuarterMapper,
 	@Override
 	public boolean doDelete(String ids) {
 		List<Long> list = Func.toLongList(ids);
-		boolean result = deleteLogic(list);
+		boolean result = removeByIds(list);
 		if (result) {
 			list.forEach(id -> {
 				QueryWrapper<CheckItemInstanceEntity> queryMapper = new QueryWrapper<>();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +23,7 @@ import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/EmergencyPlanServiceImpl.java

@@ -2,13 +2,13 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanListDTO;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanEntity;
 import com.hnac.hzims.safeproduct.mapper.EmergencyPlanMapper;
 import com.hnac.hzims.safeproduct.service.IEmergencyPlanService;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanVO;
 import com.hnac.hzims.safeproduct.wrapper.EmergencyPlanWrapper;
-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.tool.api.R;
@@ -23,7 +23,7 @@ import java.util.List;
  * @created 2020/9/9 14:40
  **/
 @Service
-public class EmergencyPlanServiceImpl extends BaseServiceImpl<EmergencyPlanMapper, EmergencyPlanEntity> implements IEmergencyPlanService {
+public class EmergencyPlanServiceImpl extends ServiceImpl<EmergencyPlanMapper, EmergencyPlanEntity> implements IEmergencyPlanService {
 
 	@Autowired
 	private EmergencyPlanMapper emergencyPlanMapper;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/EmergencyPlanTypeServiceImpl.java

@@ -2,17 +2,16 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.utils.TreeUtil;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanTypeDTO;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanTypeListDTO;
-import com.hnac.hzims.safeproduct.entity.DangerSourceEntity;
 import com.hnac.hzims.safeproduct.entity.EmergencyPlanTypeEntity;
 import com.hnac.hzims.safeproduct.mapper.EmergencyPlanTypeMapper;
 import com.hnac.hzims.safeproduct.service.IEmergencyPlanTypeService;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanTypeTreeVO;
 import com.hnac.hzims.safeproduct.vo.EmergencyPlanTypeVO;
 import com.hnac.hzims.safeproduct.wrapper.EmergencyPlanTypeWrapper;
-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.tool.api.R;
@@ -28,7 +27,7 @@ import java.util.stream.Collectors;
  * @created 2020/9/9 14:40
  **/
 @Service
-public class EmergencyPlanTypeServiceImpl extends BaseServiceImpl<EmergencyPlanTypeMapper, EmergencyPlanTypeEntity> implements IEmergencyPlanTypeService {
+public class EmergencyPlanTypeServiceImpl extends ServiceImpl<EmergencyPlanTypeMapper, EmergencyPlanTypeEntity> implements IEmergencyPlanTypeService {
 
 	@Autowired
 	private EmergencyPlanTypeMapper emergencyPlanTypeMapper;
@@ -38,7 +37,7 @@ public class EmergencyPlanTypeServiceImpl extends BaseServiceImpl<EmergencyPlanT
 		List<EmergencyPlanTypeEntity> entities = emergencyPlanTypeMapper.selectList(new QueryWrapper<EmergencyPlanTypeEntity>());
 		List<EmergencyPlanTypeTreeVO> list = entities.stream().map(o -> BeanUtil.copy(o, EmergencyPlanTypeTreeVO.class)).collect(Collectors.toList());
 		List<Long> ids = TreeUtil.builder().build().getChildIds(id, list);
-		return super.deleteLogic(ids);
+		return super.removeByIds(ids);
 	}
 
 	@Override

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java

@@ -1,7 +1,6 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java

@@ -1,12 +1,12 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity;
 import com.hnac.hzims.safeproduct.mapper.HygieneZoneMapper;
 import com.hnac.hzims.safeproduct.service.IHygieneZoneService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ImsMonAlarmInfoServiceImpl.java

@@ -1,18 +1,16 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.enume.JoinStatus;
 import com.hnac.hzims.operational.duty.feign.IDutyMainClient;
 import com.hnac.hzims.safeproduct.entity.ImsMonAlarmInfoEntity;
 import com.hnac.hzims.safeproduct.mapper.ImsMonAlarmInfoMapper;
 import com.hnac.hzims.safeproduct.service.IImsMonAlarmInfoService;
-//import com.hnac.hzims.webnotify.dto.ImsNotifyDTO;
-//import com.hnac.hzims.webnotify.feign.INotifyClient;
 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.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -29,7 +27,7 @@ import java.util.*;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class ImsMonAlarmInfoServiceImpl extends BaseServiceImpl<ImsMonAlarmInfoMapper, ImsMonAlarmInfoEntity> implements IImsMonAlarmInfoService {
+public class ImsMonAlarmInfoServiceImpl extends ServiceImpl<ImsMonAlarmInfoMapper, ImsMonAlarmInfoEntity> implements IImsMonAlarmInfoService {
 
 	private final IDutyMainClient dutyMainClient;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ImsMonCameraInfoServiceImpl.java

@@ -1,10 +1,10 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.ImsMonCameraInfoEntity;
 import com.hnac.hzims.safeproduct.mapper.ImsMonCameraInfoMapper;
 import com.hnac.hzims.safeproduct.service.IImsMonCameraInfoService;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author Chill
  */
 @Service
-public class ImsMonCameraInfoServiceImpl extends BaseServiceImpl<ImsMonCameraInfoMapper, ImsMonCameraInfoEntity> implements IImsMonCameraInfoService {
+public class ImsMonCameraInfoServiceImpl extends ServiceImpl<ImsMonCameraInfoMapper, ImsMonCameraInfoEntity> implements IImsMonCameraInfoService {
 
 	@Override
 	public boolean save(ImsMonCameraInfoEntity entity) {

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ReviewServiceImpl.java

@@ -1,11 +1,11 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.ReviewEntity;
 import com.hnac.hzims.safeproduct.mapper.ReviewMapper;
 import com.hnac.hzims.safeproduct.service.IReviewService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,5 +14,6 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 @AllArgsConstructor
-public class ReviewServiceImpl extends BaseServiceImpl<ReviewMapper, ReviewEntity> implements IReviewService  {
+public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, ReviewEntity> implements IReviewService {
+
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ReviewStandardServiceImpl.java

@@ -1,16 +1,15 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.entity.ReviewStandardEntity;
 import com.hnac.hzims.safeproduct.mapper.ReviewStandardMapper;
 import com.hnac.hzims.safeproduct.service.IReviewStandardService;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * @author 86187
  */
 @Service
-public class ReviewStandardServiceImpl extends BaseServiceImpl<ReviewStandardMapper, ReviewStandardEntity> implements IReviewStandardService {
+public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper, ReviewStandardEntity> implements IReviewStandardService {
 
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafeEquipmentTrialServiceImpl.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.SafeEquipmentDTO;
 import com.hnac.hzims.safeproduct.dto.SafeEquipmentTrialDTO;
 import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity;
@@ -11,7 +12,6 @@ import com.hnac.hzims.safeproduct.service.SafeEquipmentTrialService;
 import com.hnac.hzims.safeproduct.vo.SafeEquipmentTrialVO;
 import com.hnac.hzims.safeproduct.wrapper.SafeEquipmentTrialWrapper;
 import lombok.RequiredArgsConstructor;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -23,10 +23,9 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Optional;
 
-
 @Service
 @RequiredArgsConstructor
-public class SafeEquipmentTrialServiceImpl extends BaseServiceImpl<SafeEquipmentTrialMapper, SafeEquipmentTrialEntity> implements SafeEquipmentTrialService {
+public class SafeEquipmentTrialServiceImpl extends ServiceImpl<SafeEquipmentTrialMapper, SafeEquipmentTrialEntity> implements SafeEquipmentTrialService {
 
     /**
      * 分页查询
@@ -89,7 +88,7 @@ public class SafeEquipmentTrialServiceImpl extends BaseServiceImpl<SafeEquipment
                 lt("create_time", param.getEndTime());
             }
         }};
-        return this.baseMapper.selectCount(queryWrapper);
+        return this.baseMapper.selectCount(queryWrapper).intValue();
     }
 
     /**

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolRecheckServiceImpl.java

@@ -3,7 +3,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.safeproduct.dto.SafetyToolRecheckListDTO;
-import com.hnac.hzims.safeproduct.entity.SafetyToolRecheckEntity;
 import com.hnac.hzims.safeproduct.mapper.SafetyToolRecheckMapper;
 import com.hnac.hzims.safeproduct.service.ISafetyToolRecheckService;
 import com.hnac.hzims.safeproduct.vo.SafetyToolRecheckVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java

@@ -7,8 +7,8 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.zxing.BarcodeFormat;
-import com.hnac.hzims.message.dto.PlanMsgRecordDto;
 import com.hnac.hzims.safeproduct.constants.RedisConstants;
 import com.hnac.hzims.safeproduct.dto.SafetyToolBatchRecheckDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolDTO;
@@ -34,7 +34,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.excel.support.ExcelException;
 import org.springblade.core.excel.util.ExcelUtil;
 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;
@@ -45,7 +44,6 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -57,9 +55,7 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.*;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -70,7 +66,7 @@ import java.util.stream.IntStream;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class SafetyToolServiceImpl extends BaseServiceImpl<SafetyToolMapper, SafetyToolEntity> implements ISafetyToolService {
+public class SafetyToolServiceImpl extends ServiceImpl<SafetyToolMapper, SafetyToolEntity> implements ISafetyToolService {
     private final HttpServletResponse httpServletResponse;
     private final ISysClient sysClient;
     private final SafetyToolTypeServiceImpl safetyToolTypeService;
@@ -276,7 +272,7 @@ public class SafetyToolServiceImpl extends BaseServiceImpl<SafetyToolMapper, Saf
             isNotNull(SafetyToolEntity::getNextCheckTime);
             orderByDesc(SafetyToolEntity::getNextCheckTime);
         }});
-        return R.status(deleteLogic(idList));
+        return R.status(removeByIds(idList));
     }
 
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeBatchConfigDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeListDTO;
@@ -14,20 +15,14 @@ import com.hnac.hzims.safeproduct.vo.SafetyToolTypeVO;
 import com.hnac.hzims.safeproduct.wrapper.SafetyToolTypeWrapper;
 import lombok.RequiredArgsConstructor;
 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.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -39,7 +34,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class SafetyToolTypeServiceImpl extends BaseServiceImpl<SafetyToolTypeMapper, SafetyToolTypeEntity> implements ISafetyToolTypeService {
+public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper, SafetyToolTypeEntity> implements ISafetyToolTypeService {
 
 	private final SafetyToolTypeMapper safetyToolTypeMapper;
 	private final SafetyToolTypeUserMapper safetyToolTypeUserMapper;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 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.service.impl.ServiceImpl;
 import com.hnac.hzims.safeproduct.Constants;
 import com.hnac.hzims.safeproduct.dto.SystemFileListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileEntity;
@@ -12,7 +13,6 @@ import com.hnac.hzims.safeproduct.service.ISystemFileService;
 import com.hnac.hzims.safeproduct.service.ISystemFileTypeService;
 import com.hnac.hzims.safeproduct.vo.SystemFileVO;
 import com.hnac.hzims.safeproduct.wrapper.SystemFileWrapper;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -25,7 +25,6 @@ import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.vo.ComleteTask;
-import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,7 +42,7 @@ import java.util.stream.Collectors;
  **/
 @Service
 @RequiredArgsConstructor
-public class SystemFileServiceImpl extends BaseServiceImpl<SystemFileMapper, SystemFileEntity> implements ISystemFileService {
+public class SystemFileServiceImpl extends ServiceImpl<SystemFileMapper, SystemFileEntity> implements ISystemFileService {
 
 	private final IFlowClient flowClient;
 	private final IUserClient userClient;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.utils.TreeUtil;
 import com.hnac.hzims.safeproduct.dto.SystemFileTypeListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileTypeEntity;
@@ -10,7 +11,6 @@ import com.hnac.hzims.safeproduct.service.ISystemFileTypeService;
 import com.hnac.hzims.safeproduct.vo.SystemFileTypeTreeVO;
 import com.hnac.hzims.safeproduct.vo.SystemFileTypeVO;
 import com.hnac.hzims.safeproduct.wrapper.SystemFileTypeWrapper;
-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.tool.api.R;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * @created 2020/9/7 16:21
  **/
 @Service
-public class SystemFileTypeServiceImpl extends BaseServiceImpl<SystemFileTypeMapper, SystemFileTypeEntity> implements ISystemFileTypeService {
+public class SystemFileTypeServiceImpl extends ServiceImpl<SystemFileTypeMapper, SystemFileTypeEntity> implements ISystemFileTypeService {
 
 	@Autowired
 	private SystemFileTypeMapper systemFileTypeMapper;
@@ -36,7 +36,7 @@ public class SystemFileTypeServiceImpl extends BaseServiceImpl<SystemFileTypeMap
 		List<SystemFileTypeEntity> fileTypes = systemFileTypeMapper.selectList(new QueryWrapper<SystemFileTypeEntity>());
 		List<SystemFileTypeTreeVO> list = fileTypes.stream().map(o -> BeanUtil.copy(o, SystemFileTypeTreeVO.class)).collect(Collectors.toList());
 		List<Long> ids = TreeUtil.builder().build().getChildIds(id, list);
-		return super.deleteLogic(ids);
+		return super.removeByIds(ids);
 	}
 
 	@Override

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.safeproduct.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.safeproduct.dto.TestScoreDTO;
 import com.hnac.hzims.safeproduct.entity.TestEntity;
 import com.hnac.hzims.safeproduct.entity.TestScoreEntity;
@@ -13,7 +14,6 @@ import com.hnac.hzims.safeproduct.vo.TestScoreSumVO;
 import com.hnac.hzims.safeproduct.vo.TestScoreVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.entity.Dept;
@@ -67,7 +67,7 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
             List<TestScoreVO> scoreList = testScoreDTO.getScoreList();
             List<TestScoreEntity> testScoreEntities = new ArrayList<>();
             R<List<Dept>> deptListR = sysClient.getDeptList();
-            if (!deptListR.isSuccess()&&CollectionUtils.isEmpty(deptListR.getData())){
+            if (!deptListR.isSuccess()&&CollectionUtils.isEmpty(deptListR.getData())) {
                 log.error("获取所有机构数据失败");
             }
             List<Dept> deptList = deptListR.getData();
@@ -75,16 +75,16 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
                 TestScoreEntity testScoreEntity = new TestScoreEntity();
                 BeanUtils.copyProperties(score, testScoreEntity);
                 testScoreEntity.setTestId(testScoreDTO.getTestId());
-                if (!"^".equals(score.getUserId())&&StringUtils.isEmpty(score.getDeptName())) {
+                if (!"^".equals(score.getUserId()) && StringUtils.isEmpty(score.getDeptName())) {
                     User user = UserCache.getUser(Long.valueOf(score.getUserId()));
-                    if (ObjectUtil.isNotEmpty(user)&&StringUtils.isNotBlank(user.getDeptId())){
+                    if (ObjectUtil.isNotEmpty(user) && StringUtils.isNotBlank(user.getDeptId())) {
                         testScoreEntity.setDeptId(user.getDeptId());
                         List<Dept> depts = deptList.stream().filter(s -> Long.valueOf(user.getDeptId()).equals(s.getId())).collect(Collectors.toList());
                         if (CollectionUtils.isNotEmpty(depts)) {
                             testScoreEntity.setDeptName(depts.get(0).getDeptName());
                         }
                     }
-                }else {
+                } else {
                     testScoreEntity.setUserId(null);
                 }
                 testScoreEntities.add(testScoreEntity);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestServiceImpl.java

@@ -2,11 +2,11 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.excel.util.CollectionUtils;
 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.common.logs.utils.StringUtils;
 import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
 import com.hnac.hzims.safeproduct.dto.TestDTO;
 import com.hnac.hzims.safeproduct.entity.TestEntity;
@@ -18,7 +18,6 @@ import com.hnac.hzims.safeproduct.service.ITestScoreService;
 import com.hnac.hzims.safeproduct.service.ITestService;
 import com.hnac.hzims.safeproduct.utils.BaseUtil;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.StringUtils;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.feign.ISysClient;
@@ -27,6 +26,7 @@ import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -44,7 +44,10 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class TestServiceImpl extends ServiceImpl<TestMapper, TestEntity> implements ITestService {
-    private final ISysClient sysClient;
+
+    @Autowired
+    ISysClient sysClient;
+
     @Autowired
     ITestScoreService testScoreService;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/statistic/schedule/MainPageStatisticSchedule.java

@@ -173,10 +173,10 @@ public class MainPageStatisticSchedule {
      * @return
      */
     private Integer monthRiskCount(String month) {
-        return estimateService.count(Wrappers.<HazardEstimate>lambdaQuery()
-                .like(HazardEstimate::getCreateTime,month)
+        return Long.valueOf(estimateService.count(Wrappers.<HazardEstimate>lambdaQuery()
+                .like(HazardEstimate::getCreateTime, month)
                 .isNotNull(HazardEstimate::getRDValue)
-        );
+        )).intValue();
     }
 
     /**

hzims-service/safeproduct/src/main/resources/application-dev.yml

@@ -1,28 +0,0 @@
-#服务器端口
-server:
-  port: 8200
-
-#数据源配置
-#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/hzims?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:5816/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          username: root
-          password: 123

hzims-service/safeproduct/src/main/resources/application-prod.yml

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

hzims-service/safeproduct/src/main/resources/application-test.yml

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

hzims-service/safeproduct/src/main/resources/application.yml

@@ -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

hzims-service/safeproduct/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.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}"
+
+#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