Merge remote-tracking branch 'origin/master'

zhangfeng

2023-07-24 50304934a7a677800e94f15b0dd3f3b788a704ef

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java
#	src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java

 src/main/java/com/gk/hotwork/Config/Swagger/SwaggerConfig.java

@@ -1,6 +1,7 @@
package com.gk.hotwork.Config.Swagger;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +20,7 @@

@Configuration
@EnableSwagger2
@ConditionalOnProperty(name = "swagger.show", havingValue = "true") 
public class SwaggerConfig {

    @Bean

 src/main/java/com/gk/hotwork/Config/Swagger/WebMvcConfig.java

@@ -1,5 +1,6 @@
package com.gk.hotwork.Config.Swagger;

import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;

 src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java

@@ -19,7 +19,7 @@

    int updateByPrimaryKey(AppFileInfo record);

    List<AppFileInfo> selectDataGrid(Page<AppFileInfo> page, Map<String, Object> condition);
    List<AppFileInfo> selectDataGrid(@Param("page") Page<AppFileInfo> page,@Param("condition") Map<String, Object> condition);

    AppFileInfo selectNew(@Param("filetype") String filetype);
}

 src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.BlackListInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -11,5 +13,5 @@
@Repository
public interface BlackListInfoMapper extends BaseMapper<BlackListInfo> {

    List<BlackListInfo> selectDataGrid(Map<String, Object> condition, Page<BlackListInfo> page);
    List<BlackListInfo> selectDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<BlackListInfo> page);
}

 src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface DepartmentInfoMapper extends BaseMapper<DepartmentInfo> {

    List<DepartmentVo> selectDataGrid(Page<DepartmentVo> page, Map<String, Object> condition);
    List<DepartmentVo> selectDataGrid(@Param("page") Page<DepartmentVo> page,@Param("condition") Map<String, Object> condition);

    DepartmentInfo selectExistByName(@Param("id") Long id,@Param("department") String department);

@@ -21,9 +21,9 @@

    DepartmentInfo selectSafety(@Param("id") Long id);

    Integer selectCountForExam(Map<String, Object> params);
    Integer selectCountForExam(@Param("params") Map<String, Object> params);

    List<DepartmentInfo> selectPageForExam(Map<String, Object> params);
    List<DepartmentInfo> selectPageForExam(@Param("params") Map<String, Object> params);

    DepartmentInfo getInfoByName(String departmentName);


 src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java

@@ -25,7 +25,7 @@

    int updateByPrimaryKey(DictionaryItemInfo record);

    List<DictionaryItemInfo> selectDataGrid(Page<DictionaryItemInfo> page, Map<String, Object> condition);
    List<DictionaryItemInfo> selectDataGrid(@Param("page")  Page<DictionaryItemInfo> page,@Param("condition") Map<String, Object> condition);

    List<DictionaryTypeInfo> selectExistInfo(@Param("id") Long id,@Param("value") String value,@Param("text") String text);


 src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java

@@ -23,7 +23,7 @@

    int updateByPrimaryKey(DictionaryTypeInfo record);

    List<DictionaryTypeInfo> selectDataGrid(Page<DictionaryTypeInfo> page, Map<String, Object> condition);
    List<DictionaryTypeInfo> selectDataGrid(@Param("page")  Page<DictionaryTypeInfo> page,@Param("condition")  Map<String, Object> condition);

    List<DictionaryTypeInfo> selectExistInfo(@Param("id") Long id,@Param("code") String code,@Param("text") String text);
}

 src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface ElementManagementMapper extends BaseMapper<ElementManagement> {

    IPage<ElementManagement> selectPages(Page<ElementManagement> page,@Param("params") Map<String, Object> params);
    IPage<ElementManagement> selectPages(@Param("page")  Page<ElementManagement> page,@Param("params") Map<String, Object> params);

    List<ElementManagement> getParentElement();


 src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.EmergencyPlan;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Map;
@@ -11,5 +13,5 @@
@Repository
public interface EmergencyPlanMapper extends BaseMapper<EmergencyPlan> {

    IPage<EmergencyPlan> selectPages(Page<EmergencyPlan> page, Map<String, Object> params);
    IPage<EmergencyPlan> selectPages(@Param("page") Page<EmergencyPlan> page,@Param("params")  Map<String, Object> params);
}

 src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java

@@ -12,7 +12,7 @@
@Repository
public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {

    List<EquipmentInfo> selectDataGrid(Page<EquipmentInfo> page, Map<String, Object> condition);
    List<EquipmentInfo> selectDataGrid(@Param("page") Page<EquipmentInfo> page,@Param("condition") Map<String, Object> condition);

    EquipmentInfo selectExistByNumber(@Param("id") Long id,@Param("number") String number);

@@ -20,7 +20,7 @@

    List<EquipmentInfo> selectByTask(@Param("taskcode") String taskcode);

    List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker")String worker);
    List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker") String worker);

    List<EquipmentInfo> selectUsingByTask(@Param("code") String code);
}

 src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java

@@ -12,7 +12,7 @@
@Repository
public interface GasWarnInfoMapper extends BaseMapper<GasWarnInfo> {

    List<GasWarnInfo> selectDataGrid(Page<GasWarnInfo> page, Map<String, Object> condition);
    List<GasWarnInfo> selectDataGrid(@Param("page") Page<GasWarnInfo> page,@Param("condition") Map<String, Object> condition);

    GasWarnInfo selectExistByType(@Param("id") Long id,@Param("warntype") String warntype,@Param("gastype") String gastype);


 src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.HelpDocInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -11,5 +13,5 @@
@Repository
public interface HelpDocInfoMapper extends BaseMapper<HelpDocInfo> {

    List<HelpDocInfo> selectDataGrid(Page<HelpDocInfo> page, Map<String, Object> condition);
    List<HelpDocInfo> selectDataGrid(@Param("page") Page<HelpDocInfo> page,@Param("condition")  Map<String, Object> condition);
}

 src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java

@@ -17,9 +17,9 @@

    List<HiddenDanger> selectPages(@Param("params") Map params);

    List<HiddenDanger> selectDataGrid(Map<String, Object> condition, Page<HiddenDanger> page);
    List<HiddenDanger> selectDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<HiddenDanger> page);

    List<HiddenDanger> selectStatisticsData(Map<String, Object> condition, Page<HiddenDanger> page);
    List<HiddenDanger> selectStatisticsData(@Param("condition") Map<String, Object> condition,@Param("page") Page<HiddenDanger> page);

    int countNumInMonth(Long id);
}

 src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface MajorEquipmentAlarmMapper extends BaseMapper<MajorEquipmentAlarm> {

    IPage<MajorEquipmentAlarm> selectPages(Page<MajorEquipmentAlarm> page, Map<String, Object> params);
    IPage<MajorEquipmentAlarm> selectPages(@Param("page") Page<MajorEquipmentAlarm> page,@Param("params") Map<String, Object> params);

    void deleteByEquipmentId(@Param("id") Long id , @Param("updateBy") String updateBy , @Param("updateTime") Date updateTime);
}

 src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface MajorEquipmentDataMapper extends BaseMapper<MajorEquipmentData> {

    IPage<MajorEquipmentData> selectPages(Page<MajorEquipmentData> page, Map<String, Object> params);
    IPage<MajorEquipmentData> selectPages(@Param("page") Page<MajorEquipmentData> page,@Param("params") Map<String, Object> params);

    void deleteByEquipmentId(@Param("id") Long id , @Param("updateBy") String updateBy , @Param("updateTime") Date updateTime);
}

 src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.MajorEquipment;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -12,7 +14,7 @@
@Repository
public interface MajorEquipmentMapper extends BaseMapper<MajorEquipment> {

    IPage<MajorEquipment> selectPages(Page<MajorEquipment> page, Map<String, Object> params);
    IPage<MajorEquipment> selectPages(@Param("page") Page<MajorEquipment> page,@Param("params") Map<String, Object> params);

    List<MajorEquipment> getMajorEquipment();


 src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java

@@ -11,7 +11,7 @@
@Repository
public interface ReserveMapper extends BaseMapper<Reserve> {

    Page statistics(Page<Map> page, Map params);
    Page statistics(@Param("page") Page<Map> page,@Param("params") Map params);

    Map selectStatisticsTotal(@Param("params") Map params);


 src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.RiskAnaUnit;
import com.gk.hotwork.Domain.UserInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -13,7 +15,7 @@
@Repository
public interface RiskAnaUintMapper extends BaseMapper<RiskAnaUnit> {

    IPage<RiskAnaUnit> selectPages(Page<RiskAnaUnit> page, Map<String, Object> params, UserInfo user);
    IPage<RiskAnaUnit> selectPages(@Param("page") Page<RiskAnaUnit> page,@Param("params")  Map<String, Object> params,@Param("user")  UserInfo user);

    List<Map> selectDepartmentAnalysis();


 src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.RiskControlClassify;
import com.gk.hotwork.Domain.UserInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Map;
@@ -13,7 +15,7 @@
@Repository
public interface RiskControlClassifyMapper extends BaseMapper<RiskControlClassify> {

    IPage<RiskControlClassify> selectPages(Page<RiskControlClassify> page, Map<String, Object> filter, UserInfo user);
    IPage<RiskControlClassify> selectPages(@Param("page") Page<RiskControlClassify> page,@Param("filter") Map<String, Object> filter,@Param("user") UserInfo user);

    RiskControlClassify getByClassify1AndClassify12(String classify1, String classify2);
    /**

 src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java

@@ -13,7 +13,7 @@
@Repository
public interface SafetyInspectionItemMapper extends BaseMapper<SafetyInspectionItem> {

    IPage<SafetyInspectionItem> selectPages(Page<SafetyInspectionItem> page, Map<String, Object> params);
    IPage<SafetyInspectionItem> selectPages(Page<SafetyInspectionItem> page,@Param("params") Map<String, Object> params);

    List<SafetyInspectionItem> infoElementA(@Param("id") Long id);

@@ -21,5 +21,5 @@

    void updateSafetyInspectionItem(@Param("param") SafetyInspectionItem param);

    IPage<SafetyInspectionItem> selectCPages(Page<SafetyInspectionItem> page, Map<String, Object> params);
    IPage<SafetyInspectionItem> selectCPages(Page<SafetyInspectionItem> page,@Param("params") Map<String, Object> params);
}

 src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java

@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.SafetySelfInspection;
import com.gk.hotwork.Domain.SafetySelfInspectionItem;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Repository
public interface SafetySelfInspectionMapper extends BaseMapper<SafetySelfInspection> {

    IPage<SafetySelfInspection> selectPages(Page<SafetySelfInspection> page, Map<String, Object> params);
    IPage<SafetySelfInspection> selectPages(@Param("page") Page<SafetySelfInspection> page,@Param("params") Map<String, Object> params);


}

 src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java

@@ -15,7 +15,7 @@

    List<SelfCheckVo> selectByType(@Param("type") String type);

    List<SelfCheckInfo> selectDataGrid(Page<SelfCheckInfo> page, Map<String, Object> condition);
    List<SelfCheckInfo> selectDataGrid(@Param("page") Page<SelfCheckInfo> page,@Param("condition") Map<String, Object> condition);

    List<SelfCheckInfo> selectByIds(@Param("idList") List<Long> idList);
}

 src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gk.hotwork.Domain.SmsLogInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

@Repository
@@ -14,7 +16,7 @@

    int updateByPrimaryKey(SmsLogInfo record);

    SmsLogInfo selectByTel(String mobile, String starttime, String endtime, Byte type);
    SmsLogInfo selectByTel(@Param("mobile") String mobile,@Param("starttime") String starttime,@Param("endtime") String endtime,@Param("type") Byte type);

    void deleteByTime(String seventime);
}

 src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java

@@ -16,23 +16,23 @@
@Repository
public interface TaskInfoMapper extends BaseMapper<TaskInfo> {

    List<TaskInfo> selectTaskDataGrid(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> selectTaskDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);

    Integer getTotalByYear(Integer year);

    List<TaskInfo> selectTaskDataGridByDep(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> selectTaskDataGridByDep(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);

    List<ActiveTaskInfo> selectActiveTaskList(Date time,Byte type);

    List<TaskInfo> selectDataGridViewable(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> selectDataGridViewable(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);

    List<TaskInfo> getWaitReviewDataGrid(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> getWaitReviewDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);

    List<TaskVo> getPendingTask(@Param("type")String type, @Param("name") String name);

    List<TaskVo> getDoingTask();

    List<WorkShowTaskVo> selectPageWorkTodayDetail(Page<WorkShowTaskVo> page, Map params);
    List<WorkShowTaskVo> selectPageWorkTodayDetail(@Param("page") Page<WorkShowTaskVo> page,@Param("params") Map params);

    int selectCountWorkToday(Byte flag);

@@ -40,7 +40,7 @@

    List<Map> selectCountWorkEverydayInMonth(@Param("days")int[] index,@Param("startTime") Date startTime,@Param("status") Byte status);

    List<TaskInfo> selectStatisticsData(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> selectStatisticsData(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);

    List<TaskInfo> selectDataGridTesting(Map<String, Object> condition, Page<TaskInfo> page);
    List<TaskInfo> selectDataGridTesting(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
}

 src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java

@@ -20,9 +20,9 @@

    UserInfo selectByPrimaryKey(Long id);

    List<UserVo> selectUserDataGrid(Page<UserVo> page, Map<String, Object> record);
    List<UserVo> selectCompanyUserDataList(Page<UserVo> page, Map<String, Object> record);
    List<UserVo> selectSuperviseUserDataList(Page<UserVo> page, Map<String, Object> record);
    List<UserVo> selectUserDataGrid(@Param("page") Page<UserVo> page,@Param("record")  Map<String, Object> record);
    List<UserVo> selectCompanyUserDataList(@Param("page") Page<UserVo> page,@Param("record")  Map<String, Object> record);
    List<UserVo> selectSuperviseUserDataList(@Param("page")  Page<UserVo> page,@Param("record")  Map<String, Object> record);

    List<UserInfo> selectUserInfo(@Param("id") Long id, @Param("username") String username);

@@ -42,7 +42,7 @@

    List<UserInfo> selectPageForExam(Map<Object, Object> params);

    UserInfo getByRealName(String realname, String depName);
    UserInfo getByRealName(@Param("realname") String realname,@Param("depName") String depName);

    AccountUserVo getAccountByDepartment(@Param("department") String department);

@@ -62,7 +62,7 @@
    UserInfo getByUserId(Long userId);


    List<UserVo> selectExpertUserDataList(Page<UserVo> page, Map<String, Object> record);
    List<UserVo> selectExpertUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record);

    List<UserInfo> selectExpertList(String realname);


 src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gk.hotwork.Domain.TaskInfo;
import com.gk.hotwork.Domain.WarningInfo;

import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -12,5 +14,5 @@
@Repository
public interface WarningInfoMapper extends BaseMapper<WarningInfo> {

    List<WarningInfo> selectTaskDataGrid(Map<String, Object> condition, Page<TaskInfo> page);
    List<WarningInfo> selectTaskDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
}

 src/main/resources/application.yml

@@ -1,3 +1,6 @@
# swagger生产环境中禁止显示
swagger: 
  show: false
# mysql 多数据源
spring:
  application:
@@ -62,7 +65,6 @@
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000

logging:
  level:
    com.gk.hotwork: info