修复sonarqube异味

src/main/java/com/sooka/sponest/data/app/service/impl/AppDailyServiceImpl.java

@@ -11,7 +11,6 @@ import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 @Service

src/main/java/com/sooka/sponest/data/app/service/impl/AppLeaveServiceImpl.java

@@ -7,15 +7,12 @@ import com.sooka.sponest.data.app.domain.AppLeaveBo;
 import com.sooka.sponest.data.app.mapper.AppLeaveMapper;
 import com.sooka.sponest.data.app.service.AppLeaveService;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 @Service
 public class AppLeaveServiceImpl extends BaseServiceImpl implements AppLeaveService {
-    private static final Logger log = LoggerFactory.getLogger(AppLeaveServiceImpl.class);
 
     @Resource
     AppLeaveMapper appLeaveMapper;
@@ -27,6 +24,5 @@ public class AppLeaveServiceImpl extends BaseServiceImpl implements AppLeaveServ
         bo.setCreateTime(DateUtils.getNowDate());
         bo.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         return appLeaveMapper.insertCenterdataTLeave(bo);
-
     }
 }

src/main/java/com/sooka/sponest/data/basicdata/controller/CenterdataTForestFirehydrantController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestFirehydrant;
 import com.sooka.sponest.data.basicdata.service.ICenterdataTForestFirehydrantService;

src/main/java/com/sooka/sponest/data/commandcenter/controller/CommandCenterController.java

@@ -3,12 +3,10 @@ package com.sooka.sponest.data.commandcenter.controller;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.commandcenter.domian.CommandCenterBO;
 import com.sooka.sponest.data.commandcenter.domian.ProjectBody;
 import com.sooka.sponest.data.commandcenter.service.ICommandCenterService;
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureViewBO;
-import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/sooka/sponest/data/commandcenter/service/ICommandCenterService.java

@@ -4,7 +4,6 @@ import com.sooka.sponest.data.commandcenter.domian.AreaBody;
 import com.sooka.sponest.data.commandcenter.domian.CommandCenterBO;
 import com.sooka.sponest.data.commandcenter.domian.ProjectBody;
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureViewBO;
-import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestNetworkprocessing;
 
 import java.util.List;

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmAgriculturalCooperativesController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmAgriculturalCooperatives;

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmFilingsLivestockController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmFilingsLivestock;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmFilingsLivestockService;

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmGreenhouseFilmController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmGreenhouseFilm;
 import com.sooka.sponest.data.digitalagriculture.domain.vo.CenterdataTFarmGreenhouseFilmVo;

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmLivestockController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmLivestock;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmLivestockService;

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmLivestockCountController.java

@@ -12,7 +12,6 @@ import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmPesticideInformation.java

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * 农药信息对象 centerdata_t_farm_pesticide_information

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/vo/CenterdataTFarmLivestockInfoCountVo.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-
 import javax.validation.constraints.NotBlank;
 
 @Data

src/main/java/com/sooka/sponest/data/digitalagriculture/mapper/CenterdataTFarmLivestockInfoMapper.java

@@ -2,7 +2,6 @@ package com.sooka.sponest.data.digitalagriculture.mapper;
 
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmLivestock;
 import com.sooka.sponest.data.digitalagriculture.domain.vo.CenterdataTFarmLivestockInfoCountVo;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 public interface CenterdataTFarmLivestockInfoMapper {

src/main/java/com/sooka/sponest/data/digitalagriculture/service/ICenterdataTFarmLivestockInfoService.java

@@ -2,7 +2,6 @@ package com.sooka.sponest.data.digitalagriculture.service;
 
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmLivestock;
 import com.sooka.sponest.data.digitalagriculture.domain.vo.CenterdataTFarmLivestockInfoCountVo;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/CenterdataTFarmPesticideInformationServiceImpl.java

@@ -8,8 +8,6 @@ import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmPesticideInformation;
 import com.sooka.sponest.data.digitalagriculture.mapper.CenterdataTFarmPesticideInformationMapper;
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmPesticideInformationService;
-import com.sooka.sponest.data.system.attach.service.ICenterdataTAttachService;
-import com.sooka.sponest.data.utils.DataAttachUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/sooka/sponest/data/digitalemergency/controller/CenterdataTEmergencyEnterprisesController.java

@@ -8,12 +8,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyEnterprises;
 import com.sooka.sponest.data.digitalemergency.service.ICenterdataTEmergencyEnterprisesService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/sooka/sponest/data/digitalemergency/controller/CenterdataTEmergencyTeamController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyTeam;
 import com.sooka.sponest.data.digitalemergency.service.ICenterdataTEmergencyTeamService;

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyTeam.java

@@ -6,8 +6,6 @@ import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

src/main/java/com/sooka/sponest/data/digitalemergency/domain/CenterdataTEmergencyWarehouse.java

@@ -6,8 +6,6 @@ import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/CenterdataTEnvironmentKeyEnterpriseController.java

@@ -12,8 +12,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentKeyEnterprise;
 import com.sooka.sponest.data.digitalenvironment.service.ICenterdataTEnvironmentKeyEnterpriseService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/CenterdataTEnvironmentSewageOutletController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentSewageOutlet;
 import com.sooka.sponest.data.digitalenvironment.service.ICenterdataTEnvironmentSewageOutletService;

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/CenterdataTEnvironmentSourcePollutionController.java

@@ -9,12 +9,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentSourcePollution;
 import com.sooka.sponest.data.digitalenvironment.service.ICenterdataTEnvironmentSourcePollutionService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/CenterdataTEnvironmentWaterMonitorController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTHydraulicWaterMonitor;
 import com.sooka.sponest.data.digitalenvironment.service.ICenterdataTEnvironmentWaterMonitorService;

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/CenterdataTEnvironmentWater.java

@@ -64,20 +64,6 @@ public class CenterdataTEnvironmentWater extends BaseBusinessEntity {
     private String deptName;
 
     /**
-     * 创建人名称
-     */
-//    @Excel(name = "创建人名称")
-    @ApiModelProperty(value = "创建人名称", required = false,hidden = true)
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-//    @Excel(name = "更新人名称")
-    @ApiModelProperty(value = "更新人名称", required = false,hidden = true)
-    private String updateName;
-
-    /**
      * 用户ID
      */
 //    @Excel(name = "用户ID")
@@ -146,22 +132,6 @@ public class CenterdataTEnvironmentWater extends BaseBusinessEntity {
         return deptName;
     }
 
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
     public void setUserId(Long userId) {
         this.userId = userId;
     }

src/main/java/com/sooka/sponest/data/digitalenvironment/domain/CenterdataTHydraulicWaterMonitor.java

@@ -1,12 +1,11 @@
 package com.sooka.sponest.data.digitalenvironment.domain;
 
+import com.ruoyi.common.core.annotation.Excel;
 import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestChannelController.java

@@ -12,8 +12,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestChannel;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestChannelService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestFireteamController.java

@@ -9,12 +9,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestFireteam;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestFireteamService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestKeyFireproofPlotsController.java

@@ -10,12 +10,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestKeyFireproofPlots;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestKeyFireproofPlotsService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestLandingController.java

@@ -12,8 +12,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestLanding;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestLandingService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTAfforestationDoneServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysUser;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTAfforestationTaskServiceImpl.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTAfforestationDone;

src/main/java/com/sooka/sponest/data/digitalresource/controller/CenterdataTResourcesDepositController.java

@@ -10,12 +10,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesDeposit;
 import com.sooka.sponest.data.digitalresource.service.ICenterdataTResourcesDepositService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/sooka/sponest/data/digitalresource/controller/CenterdataTResourcesGeologicHazardController.java

@@ -9,12 +9,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesGeologicHazard;
 import com.sooka.sponest.data.digitalresource.service.ICenterdataTResourcesGeologicHazardService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/sooka/sponest/data/digitalresource/controller/CenterdataTResourcesIllegalConstructionController.java

@@ -9,12 +9,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesIllegalConstruction;
 import com.sooka.sponest.data.digitalresource.service.ICenterdataTResourcesIllegalConstructionService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/sooka/sponest/data/digitalresource/domain/CenterdataTResourcesIllegalConstruction.java

@@ -5,7 +5,6 @@ import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

src/main/java/com/sooka/sponest/data/digitaltraffic/controller/CenterdataTBridgeController.java

@@ -13,8 +13,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitaltraffic.domain.CenterdataTBridge;
 import com.sooka.sponest.data.digitaltraffic.service.ICenterdataTBridgeService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/sooka/sponest/data/digitaltraffic/controller/CenterdataTCulvertController.java

@@ -13,8 +13,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitaltraffic.domain.CenterdataTCulvert;
 import com.sooka.sponest.data.digitaltraffic.service.ICenterdataTCulvertService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/sooka/sponest/data/digitaltraffic/controller/CenterdataTWarningSignController.java

@@ -13,8 +13,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitaltraffic.domain.CenterdataTWarningSign;
 import com.sooka.sponest.data.digitaltraffic.service.ICenterdataTWarningSignService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicChannelBluelineController.java

@@ -9,14 +9,13 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicChannelBlueline;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicChannelBluelineService;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicReachService;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicRiverService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicGarbageStationController.java

@@ -13,8 +13,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicGarbageStation;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicGarbageStationService;
-import com.sooka.sponest.data.utils.DataProducerUtil;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.DataProducerUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicOutletSewageController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.base.domain.ESVo;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicOutletSewage;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicOutletSewageService;

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicPatrolPlanRecordController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.digitalwater.controller;
 
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
@@ -9,8 +8,6 @@ import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicPatrolPlan
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicPatrolPlanRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,8 +27,6 @@ public class CenterdataTHydraulicPatrolPlanRecordController extends BaseControll
     @Autowired
     private ICenterdataTHydraulicPatrolPlanRecordService centerdataTHydraulicPatrolPlanRecordService;
 
-    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
     /**
      * 查询巡查记录接口
      */

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicPatrolTaskController.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.data.digitalwater.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -17,8 +16,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -41,8 +38,6 @@ public class CenterdataTHydraulicPatrolTaskController extends BaseController {
     @Autowired
     private ICenterdataTHydraulicPatrolTaskService centerdataTHydraulicPatrolTaskService;
 
-    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
     /**
      * 查询水利巡查任务列表
      */
@@ -79,10 +74,10 @@ public class CenterdataTHydraulicPatrolTaskController extends BaseController {
     @RequiresPermissions("water:task:export")
     @Log(title = "水利巡查任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response,CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask) {
+    public void export(HttpServletResponse response, CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask) {
         List<CenterdataTHydraulicPatrolTask> list = centerdataTHydraulicPatrolTaskService.selectCenterdataTHydraulicPatrolTaskList(centerdataTHydraulicPatrolTask);
         ExcelUtil<CenterdataTHydraulicPatrolTask> util = new ExcelUtil<>(CenterdataTHydraulicPatrolTask.class);
-        switch (centerdataTHydraulicPatrolTask.getType()){
+        switch (centerdataTHydraulicPatrolTask.getType()) {
             case "1":
                 util.exportExcel(response, list, "林业巡查任务数据");
                 break;
@@ -104,9 +99,6 @@ public class CenterdataTHydraulicPatrolTaskController extends BaseController {
             default:
                 break;
         }
-
-
-
     }
 
     /**
@@ -131,9 +123,9 @@ public class CenterdataTHydraulicPatrolTaskController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask) {
         String tableName = "centerdata_t_hydraulic_patrol_task";
-        String[] keys = {"plan_id" , "task_name" , "type","dept_id"};
-        String[] values = {centerdataTHydraulicPatrolTask.getPlanId() , centerdataTHydraulicPatrolTask.getTaskName() , centerdataTHydraulicPatrolTask.getType(),String.valueOf(centerdataTHydraulicPatrolTask.getDeptId())};
-        if(!centerdataTHydraulicPatrolTaskService.uniqueCheck(tableName, keys, values)){
+        String[] keys = {"plan_id", "task_name", "type", "dept_id"};
+        String[] values = {centerdataTHydraulicPatrolTask.getPlanId(), centerdataTHydraulicPatrolTask.getTaskName(), centerdataTHydraulicPatrolTask.getType(), String.valueOf(centerdataTHydraulicPatrolTask.getDeptId())};
+        if (!centerdataTHydraulicPatrolTaskService.uniqueCheck(tableName, keys, values)) {
             return AjaxResult.error(DataConstants.ERROR_MSG);
         }
         return toAjax(centerdataTHydraulicPatrolTaskService.insertCenterdataTHydraulicPatrolTask(centerdataTHydraulicPatrolTask));
@@ -148,9 +140,9 @@ public class CenterdataTHydraulicPatrolTaskController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask) {
         String tableName = "centerdata_t_hydraulic_patrol_task";
-        String[] keys = {"plan_id" , "task_name" , "type" , "id","dept_id"};
-        String[] values = {centerdataTHydraulicPatrolTask.getPlanId() , centerdataTHydraulicPatrolTask.getTaskName() , centerdataTHydraulicPatrolTask.getType() , centerdataTHydraulicPatrolTask.getId(),String.valueOf(centerdataTHydraulicPatrolTask.getDeptId())};
-        if(!centerdataTHydraulicPatrolTaskService.uniqueCheck(tableName, keys, values)){
+        String[] keys = {"plan_id", "task_name", "type", "id", "dept_id"};
+        String[] values = {centerdataTHydraulicPatrolTask.getPlanId(), centerdataTHydraulicPatrolTask.getTaskName(), centerdataTHydraulicPatrolTask.getType(), centerdataTHydraulicPatrolTask.getId(), String.valueOf(centerdataTHydraulicPatrolTask.getDeptId())};
+        if (!centerdataTHydraulicPatrolTaskService.uniqueCheck(tableName, keys, values)) {
             return AjaxResult.error(DataConstants.ERROR_MSG);
         }
         return toAjax(centerdataTHydraulicPatrolTaskService.updateCenterdataTHydraulicPatrolTask(centerdataTHydraulicPatrolTask));

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicRiverLengthController.java

@@ -67,27 +67,27 @@ public class CenterdataTHydraulicRiverLengthController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, CenterdataTHydraulicRiverLength centerdataTHydraulicRiverLength) throws Exception {
         List<CenterdataTHydraulicRiverLength> list = centerdataTHydraulicRiverLengthService.selectCenterdataTHydraulicRiverLengthList(centerdataTHydraulicRiverLength);
-        switch (centerdataTHydraulicRiverLength.getType()){
+        switch (centerdataTHydraulicRiverLength.getType()) {
             case "2":
                 ExcelUtil<CenterdataTHydraulicRiverLength> heUtil = new ExcelUtil<>(CenterdataTHydraulicRiverLength.class);
                 heUtil.exportExcel(response, list, "河长名录数据");
                 break;
             case "3":
-                convertToClass(response,list, CenterdataTHydraulicRiverLengthVoToLu.class,"路长名录数据");
+                convertToClass(response, list, CenterdataTHydraulicRiverLengthVoToLu.class, "路长名录数据");
                 break;
             case "6":
-                convertToClass(response,list, CenterdataTHydraulicRiverLengthVoToTian.class,"田长名录数据");
+                convertToClass(response, list, CenterdataTHydraulicRiverLengthVoToTian.class, "田长名录数据");
                 break;
             default:
                 break;
         }
     }
 
-    public static<T> void convertToClass(HttpServletResponse response, List<CenterdataTHydraulicRiverLength> list, Class<T> clazz, String name) throws InstantiationException, IllegalAccessException {
+    public static <T> void convertToClass(HttpServletResponse response, List<CenterdataTHydraulicRiverLength> list, Class<T> clazz, String name) throws InstantiationException, IllegalAccessException {
         List<T> result = new ArrayList<>();
         for (CenterdataTHydraulicRiverLength centerdataTHydraulicRiverLength : list) {
             T t = clazz.newInstance();
-            BeanUtils.copyProperties(centerdataTHydraulicRiverLength,t);
+            BeanUtils.copyProperties(centerdataTHydraulicRiverLength, t);
             result.add(t);
         }
         ExcelUtil<T> luUtil = new ExcelUtil<>(clazz);
@@ -104,16 +104,15 @@ public class CenterdataTHydraulicRiverLengthController extends BaseController {
             @ApiImplicitParam(name = "id", value = "主键id", dataType = "String", required = true)
     })
     public AjaxResult getInfo(@PathVariable(value = "id") String id) {
-
-        Map<String,Object> map = new HashMap<>();
-        map.put("id",id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", id);
         int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
-        if (num>0){
+        if (num > 0) {
             return AjaxResult.error("当前人员已有下级资源");
         }
         //centerdata_t_hydraulic_river_hechang 河长牌
         int heChangNum = centerdataTHydraulicRiverLengthService.selectHeChangByHechangId(id);
-        if (heChangNum > 0 ){
+        if (heChangNum > 0) {
             return AjaxResult.error("当前人员已有下级河长牌资源");
         }
         return AjaxResult.success(centerdataTHydraulicRiverLengthService.selectCenterdataTHydraulicRiverLengthById(id));
@@ -152,23 +151,22 @@ public class CenterdataTHydraulicRiverLengthController extends BaseController {
             @ApiImplicitParam(name = "ids", value = "主键id", dataType = "String[]", required = true),
             @ApiImplicitParam(name = "type", value = "类型", dataType = "String", required = true)
     })
-    public AjaxResult remove(@PathVariable String[] ids,@PathVariable String type) {
-        for (String id : ids){
-            Map<String,Object> map = new HashMap<>();
-            map.put("type",type);
-            map.put("id",id);
+    public AjaxResult remove(@PathVariable String[] ids, @PathVariable String type) {
+        for (String id : ids) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("type", type);
+            map.put("id", id);
             int num = centerdataTHydraulicRiverLengthService.selectPersonByUserId(map);
-            if (num>0){
+            if (num > 0) {
                 return AjaxResult.error("当前人员已有下级资源");
             }
-            if ("2".equals(type)){
+            if ("2".equals(type)) {
                 int heChangNum = centerdataTHydraulicRiverLengthService.selectHeChangByHechangId(id);
-                if (heChangNum > 0 ){
+                if (heChangNum > 0) {
                     return AjaxResult.error("当前人员已有下级河长牌资源");
                 }
             }
         }
-
         return toAjax(centerdataTHydraulicRiverLengthService.deleteCenterdataTHydraulicRiverLengthByIds(ids));
     }
 }

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicWadeBridgeCulvertController.java

@@ -94,7 +94,7 @@ public class CenterdataTHydraulicWadeBridgeCulvertController extends BaseControl
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTHydraulicWadeBridgeCulvert centerdataTHydraulicWadeBridgeCulvert) {
         int result = centerdataTHydraulicWadeBridgeCulvertService.insertCenterdataTHydraulicWadeBridgeCulvert(centerdataTHydraulicWadeBridgeCulvert);
-        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT,BusinessType.INSERT, JSON.toJSONString(centerdataTHydraulicWadeBridgeCulvert)));
+        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT, BusinessType.INSERT, JSON.toJSONString(centerdataTHydraulicWadeBridgeCulvert)));
         return toAjax(result);
     }
 
@@ -107,7 +107,7 @@ public class CenterdataTHydraulicWadeBridgeCulvertController extends BaseControl
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTHydraulicWadeBridgeCulvert centerdataTHydraulicWadeBridgeCulvert) {
         int result = centerdataTHydraulicWadeBridgeCulvertService.updateCenterdataTHydraulicWadeBridgeCulvert(centerdataTHydraulicWadeBridgeCulvert);
-        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT,BusinessType.UPDATE, JSON.toJSONString(centerdataTHydraulicWadeBridgeCulvert)));
+        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT, BusinessType.UPDATE, JSON.toJSONString(centerdataTHydraulicWadeBridgeCulvert)));
         return toAjax(result);
     }
 
@@ -124,9 +124,7 @@ public class CenterdataTHydraulicWadeBridgeCulvertController extends BaseControl
     public AjaxResult remove(@PathVariable String[] ids) {
         int result = centerdataTHydraulicWadeBridgeCulvertService.deleteCenterdataTHydraulicWadeBridgeCulvertByIds(ids);
         List<String> idList = Arrays.asList(ids);
-        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT,BusinessType.DELETE, JSON.toJSONString(idList)));
+        DataProducerUtil.getInstance().publish(new ESVo(DocumentNameConstants.HYDRAULIC_WADE_BRIDGE_CULVERT, BusinessType.DELETE, JSON.toJSONString(idList)));
         return toAjax(result);
     }
-
-
 }

src/main/java/com/sooka/sponest/data/generalbusiness/controller/CenterdataTKeyProjectsScheduleController.java

@@ -1,11 +1,8 @@
 package com.sooka.sponest.data.generalbusiness.controller;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.system.api.RemoteDeptService;
-import com.ruoyi.system.api.domain.SysDept;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTKeyProjectsSchedule;
 import com.sooka.sponest.data.generalbusiness.service.ICenterdataTKeyProjectsScheduleService;
 import io.swagger.annotations.Api;
@@ -13,8 +10,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/projectsSchedule")
 @Api(tags = "数据中心重点工程进度管理控制器")

src/main/java/com/sooka/sponest/data/generalbusiness/service/impl/CenterdataTForestImportareaServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.data.generalbusiness.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -23,7 +22,6 @@ import com.sooka.sponest.data.utils.RegionalFlagUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/sooka/sponest/data/index/service/impl/IndexViewServiceImpl.java

@@ -60,6 +60,8 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
             case "8":
                 map = indexViewMapper.getFire();
                 break;
+            default:
+                break;
         }
         return map;
     }
@@ -72,23 +74,19 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
     public List<IndexViewInfo> getBasicDataList(MenuInfo menu) {
         setSookaDataBase(menu);
         List<IndexViewInfo> basicList = new ArrayList<>();
-
-// 获取菜单信息
+        // 获取菜单信息
         List<MenuInfo> basicDataList = indexViewMapper.getBasicDataList(menu);
 
-// 存储小类计数信息，key值为小类，value为小类数
+        // 存储小类计数信息，key值为小类，value为小类数
         Map<String, Long> subclassCount = new TreeMap<>();
         Map<String, List<MenuInfo>> resultMap = new HashMap<>();
-
         for (MenuInfo item : basicDataList) {
             String[] subclassS = item.getSubclassS().split(",");
             String[] tableNameAndType = item.getTableNameAndType().split("/");
-
             // 小类的统计次数
             for (String subclass : subclassS) {
                 subclassCount.merge(subclass, 1L, Long::sum);
             }
-
             for (String subclass : subclassS) {
                 // 检查resultMap中是否已经存在对应subclass的键
                 if (!resultMap.containsKey(subclass)) {
@@ -97,14 +95,12 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
                 // 将当前的item添加到对应subclass的列表中
                 resultMap.get(subclass).add(item);
             }
-
             // 将tableName和type放入MenuInfo对象中
             item.setTableName(tableNameAndType[0]);
             if (tableNameAndType.length > 1) {
                 item.setType(tableNameAndType[1]);
             }
         }
-
         // 分类名称映射
         Map<String, String> categoryMap = new HashMap<>();
         categoryMap.put("project", "数字项目基础数据");
@@ -118,17 +114,14 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
         categoryMap.put("traffic", "交通基础数据");
         categoryMap.put("resources", "自然资源基础数据");
         categoryMap.put("water", "水利基础数据");
-
         for (Map.Entry<String, List<MenuInfo>> entry : resultMap.entrySet()) {
             String subclass = entry.getKey();
             IndexViewInfo indexViewInfo = new IndexViewInfo();
             indexViewInfo.setCount(0L);
             indexViewInfo.setUpdataCount(0L);
-
             indexViewInfo.setCategory(categoryMap.get(subclass));
             indexViewInfo.setCategoryEnglish(subclass);
             indexViewInfo.setSubclass(subclassCount.get(subclass));
-
             List<MenuInfo> menuInfos = entry.getValue();
             for (MenuInfo menuInfo : menuInfos) {
                 setSookaDataBase(menuInfo);
@@ -137,7 +130,7 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
                 MenuInfo menuInfo1 = new MenuInfo();
                 setSookaDataBase(menuInfo1);
                 BeanUtils.copyProperties(menuInfo, menuInfo1);
-                if (menu.getTimeArr()!=null){
+                if (menu.getTimeArr() != null) {
                     String[] date = menu.getTimeArr().split(",");
                     menuInfo1.setStartDate(date[0]);
                     menuInfo1.setEndDate(date[1]);
@@ -145,25 +138,21 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
                 menuInfo1.setMark("xiugai");
                 Long updateCount = indexViewMapper.getBasicDataCount(menuInfo1);
                 indexViewInfo.setUpdataCount(indexViewInfo.getUpdataCount() + updateCount);
-
             }
             basicList.add(indexViewInfo);
         }
-
-// 统计总的数据数量
+        // 统计总的数据数量
         long totalCount = 0;
         for (IndexViewInfo info : basicList) {
             totalCount += info.getCount();
         }
-
         IndexViewInfo indexViewInfo = new IndexViewInfo();
         indexViewInfo.setCategory("共有基础数据类型");
         indexViewInfo.setCategoryEnglish("all");
         indexViewInfo.setSubclass((long) basicDataList.size());
         indexViewInfo.setCount(totalCount);
         basicList.add(indexViewInfo);
-
-// 使用自定义的 Comparator 对 basicList 进行排序
+        // 使用自定义的 Comparator 对 basicList 进行排序
         basicList.sort(customComparator);
         return basicList;
     }
@@ -171,24 +160,10 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
     //排序
     Comparator<IndexViewInfo> customComparator = (info1, info2) -> {
         // 按照顺序进行比较
-        List<String> order = Arrays.asList(
-                "林业基础数据",
-                "农业基础数据",
-                "水利基础数据",
-                "环保基础数据",
-                "应急基础数据",
-                "交通基础数据",
-                "自然资源基础数据",
-                "消防基础数据",
-                "数字项目基础数据",
-                "数字公安基础数据",
-                "数字森侦基础数据",
-                "共有基础数据类型"
-        );
-
+        List<String> order = Arrays.asList("林业基础数据", "农业基础数据", "水利基础数据", "环保基础数据", "应急基础数据", "交通基础数据",
+                "自然资源基础数据", "消防基础数据", "数字项目基础数据", "数字公安基础数据", "数字森侦基础数据", "共有基础数据类型");
         int index1 = order.indexOf(info1.getCategory());
         int index2 = order.indexOf(info2.getCategory());
-
         if (index1 < index2) {
             return -1;
         } else if (index1 > index2) {
@@ -199,7 +174,6 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
         }
     };
 
-
     /**
      * 获取一网通办数据
      *
@@ -330,24 +304,24 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
     }
 
     /*
-    * 数据中心-数据统计
-    *
-    * @author 韩福成
-    * @date 2023/11/3 11:19
-    */
-    public Map<String,Object> dataStatistics(MenuInfo menuInfo) {
+     * 数据中心-数据统计
+     *
+     * @author 韩福成
+     * @date 2023/11/3 11:19
+     */
+    public Map<String, Object> dataStatistics(MenuInfo menuInfo) {
         setSookaDataBase(menuInfo);
         // 获取菜单信息
         List<MenuInfo> basicDataList = indexViewMapper.getBasicDataList(menuInfo);
-        Map<String,Object> map = new LinkedHashMap<>();
-        map.put("铁东区","0,100,365,372");
-        map.put("铁西区","0,100,365,373");
-        map.put("双辽市","0,100,365,369");
-        map.put("伊通县","0,100,365,370");
-        map.put("梨树县","0,100,365,371");
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("铁东区", "0,100,365,372");
+        map.put("铁西区", "0,100,365,373");
+        map.put("双辽市", "0,100,365,369");
+        map.put("伊通县", "0,100,365,370");
+        map.put("梨树县", "0,100,365,371");
         int a = 101;
-        Map<String,Object> td = new LinkedHashMap<>();
-        for (Map.Entry<String, Object> m : map.entrySet()){
+        Map<String, Object> td = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> m : map.entrySet()) {
             Long updateCount = 0L;
             Long count = 0L;
             for (MenuInfo item : basicDataList) {
@@ -360,8 +334,8 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
                 //更新数
                 MenuInfo info1 = new MenuInfo();
                 setSookaDataBase(info1);
-                BeanUtils.copyProperties(item,info1);
-                if (menuInfo.getTimeArr()!=null){
+                BeanUtils.copyProperties(item, info1);
+                if (menuInfo.getTimeArr() != null) {
                     String[] date = menuInfo.getTimeArr().split(",");
                     info1.setStartDate(date[0]);
                     info1.setEndDate(date[1]);
@@ -369,39 +343,39 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
                 info1.setMark("xiugai");
                 updateCount += indexViewMapper.getBasicDataCount(info1);
             }
-            td.put("count"+a,count);
-            td.put("updateCount"+a,updateCount);
-            BigDecimal updateRate = new BigDecimal(0).setScale(2,RoundingMode.HALF_UP);
-            if (updateCount!=0) {
+            td.put("count" + a, count);
+            td.put("updateCount" + a, updateCount);
+            BigDecimal updateRate = new BigDecimal(0).setScale(2, RoundingMode.HALF_UP);
+            if (updateCount != 0) {
                 BigDecimal counts = new BigDecimal(count);
                 BigDecimal updateCounts = new BigDecimal(updateCount);
-                updateRate = updateCounts.divide(counts,4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2,RoundingMode.HALF_UP);
+                updateRate = updateCounts.divide(counts, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
             }
-            td.put("updateRate"+a,updateRate+"%");
-            a+=1;
+            td.put("updateRate" + a, updateRate + "%");
+            a += 1;
         }
         List<IndexViewInfo> indexViewInfoList = this.getBasicDataList(menuInfo);
         int b = 106;
-        for (IndexViewInfo indexViewInfo : indexViewInfoList){
-            if (!indexViewInfo.getCategory().equals("共有基础数据类型")){
-                td.put("count"+b,indexViewInfo.getCount());
-                td.put("updateCount"+b,indexViewInfo.getUpdataCount());
-                BigDecimal updateRate = new BigDecimal(0).setScale(2,RoundingMode.HALF_UP);
-                if (indexViewInfo.getUpdataCount()!=0){
+        for (IndexViewInfo indexViewInfo : indexViewInfoList) {
+            if (!indexViewInfo.getCategory().equals("共有基础数据类型")) {
+                td.put("count" + b, indexViewInfo.getCount());
+                td.put("updateCount" + b, indexViewInfo.getUpdataCount());
+                BigDecimal updateRate = new BigDecimal(0).setScale(2, RoundingMode.HALF_UP);
+                if (indexViewInfo.getUpdataCount() != 0) {
                     BigDecimal counts = new BigDecimal(indexViewInfo.getCount());
                     BigDecimal updateCounts = new BigDecimal(indexViewInfo.getUpdataCount());
-                    updateRate = updateCounts.divide(counts,4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2,RoundingMode.HALF_UP);
+                    updateRate = updateCounts.divide(counts, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
                 }
-                td.put("updateRate"+b,updateRate+"%");
+                td.put("updateRate" + b, updateRate + "%");
             }
-            b+=1;
+            b += 1;
         }
-        td.put("count201",0);
-        td.put("updateCount201",0);
-        td.put("updateRate201","0.00%");
-        td.put("count202",0);
-        td.put("updateCount202",0);
-        td.put("updateRate202","0.00%");
+        td.put("count201", 0);
+        td.put("updateCount201", 0);
+        td.put("updateRate201", "0.00%");
+        td.put("count202", 0);
+        td.put("updateCount202", 0);
+        td.put("updateRate202", "0.00%");
         return td;
     }
 }

src/main/java/com/sooka/sponest/data/system/attach/domain/CenterdataTAttach.java

@@ -5,8 +5,6 @@ import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 

src/main/java/com/sooka/sponest/data/utils/FileUtil.java

@@ -12,72 +12,36 @@ import java.util.List;
  */
 public class FileUtil {
 
-    /**
-     * 附件文件 保存前处理
-     */
-    public static List<CenterdataTAttach>  documentProcessing(String Id,String attachId,String attachFileUrl,String attachFileName,String source,String busindx) {
-        List<CenterdataTAttach> list = new ArrayList<>();
+    private FileUtil() {
+        throw new IllegalStateException("Utility class");
+    }
 
-        if (StringUtils.isNotEmpty(Id)){//修改逻辑
+    public static List<CenterdataTAttach> documentProcessing(String id, String attachId, List<String> fileUrlsList, List<String> fileNamesList, String source, String busindx) {
+        List<CenterdataTAttach> list = new ArrayList<>();
+        // 新增逻辑
+        if (StringUtils.isBlank(id)) {
+            for (int i = 0; i < fileUrlsList.size(); i++) {
+                if (null == fileUrlsList.get(i)) {
+                    continue;
+                }
+                String fileUrl = fileUrlsList.get(i).replace(",", "");
+                String fileName = fileNamesList.get(i).replace(",", "");
 
-            String[] fileUrls = attachFileUrl.split(",");
-            String[] fileNames = attachFileName.split(",");
-            String fileUrl = "";
-            for (int i = 0; i < fileUrls.length; i++) {
                 CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
-                centerdataTAttach.setBusId(attachId);
-                if (fileUrls[i].indexOf("+") > -1 || fileUrls[i].indexOf("&&") > -1) {
-                    if (fileUrls[i].indexOf("+") > -1) {
-                        fileUrl = fileUrls[i].substring(0, fileUrls[i].indexOf("+"));
-                    } else {
-                        fileUrl = fileUrls[i];
-                    }
-                    String[] fileurls = fileUrl.split("&&");
-                    fileUrl = fileurls[1].substring(fileurls[1].indexOf("=") + 1) + "/" + fileurls[2].substring(fileurls[2].indexOf("=") + 1);
-                } else {
-                    fileUrl = fileUrls[i];
-                }
-                String filetype = FilePrefixUtils.getUrlSuffix(fileUrls[i]);
+                String filetype = FilePrefixUtils.getUrlSuffix(fileUrlsList.get(i));
                 centerdataTAttach.setFileType(filetype);
+                centerdataTAttach.setBusId(attachId);
                 centerdataTAttach.setBusSource(source);
                 centerdataTAttach.setAttachPath(fileUrl);
-                centerdataTAttach.setFileName(fileNames[i]);
                 centerdataTAttach.setBusIndx(busindx);
+                centerdataTAttach.setFileName(fileName);
+                attach(centerdataTAttach);
                 list.add(centerdataTAttach);
             }
-            return list;
-
-
-        }else {//新增逻辑
-            if (StringUtils.isNotEmpty(attachFileUrl)) {
-                String[] fileUrls = attachFileUrl.split(",");
-                String[] fileNames = attachFileName.split(",");
-                for (int i = 0; i < fileUrls.length; i++) {
-                    CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
-                    String filetype = FilePrefixUtils.getUrlSuffix(fileUrls[i]);
-                    centerdataTAttach.setFileType(filetype);
-                    centerdataTAttach.setBusId(attachId);
-                    centerdataTAttach.setBusSource(source);
-                    centerdataTAttach.setAttachPath(fileUrls[i]);
-                    centerdataTAttach.setBusIndx(busindx);
-                    centerdataTAttach.setFileName(fileNames[i]);
-                    attach(centerdataTAttach);
-                    list.add(centerdataTAttach);
-                }
-                return list;
-            }
-
-        }
-
-            return list;
-    }
-
-    public static List<CenterdataTAttach>  documentProcessing(String Id,String attachId, List<String> fileUrlsList, List<String> fileNamesList, String source,String busindx) {
-        List<CenterdataTAttach> list = new ArrayList<>();
-        if (StringUtils.isNotEmpty(Id)){//修改逻辑
+        } else {
             String fileUrl = "";
             for (int i = 0; i < fileUrlsList.size(); i++) {
-                if(null == fileUrlsList.get(i)){
+                if (null == fileUrlsList.get(i)) {
                     continue;
                 }
                 CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
@@ -93,40 +57,17 @@ public class FileUtil {
                 } else {
                     fileUrl = fileUrlsList.get(i);
                 }
-                String fileName = fileNamesList.get(i).replace(",","");
-                fileUrl = fileUrl.replace(",","");
+                String fileName = fileNamesList.get(i).replace(",", "");
+                fileUrl = fileUrl.replace(",", "");
 
                 String filetype = FilePrefixUtils.getUrlSuffix(fileUrlsList.get(i));
                 centerdataTAttach.setFileType(filetype);
                 centerdataTAttach.setBusSource(source);
                 centerdataTAttach.setAttachPath(fileUrl);
-                centerdataTAttach.setFileName(fileName);
                 centerdataTAttach.setBusIndx(busindx);
+                centerdataTAttach.setFileName(fileName);
                 list.add(centerdataTAttach);
             }
-            return list;
-        }else {//新增逻辑
-            if (!fileUrlsList.isEmpty()) {
-                for (int i = 0; i < fileUrlsList.size(); i++) {
-                    if(null == fileUrlsList.get(i)){
-                        continue;
-                    }
-                    String fileUrl = fileUrlsList.get(i).replace(",", "");
-                    String fileName = fileNamesList.get(i).replace(",", "");
-
-                    CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
-                    String filetype = FilePrefixUtils.getUrlSuffix(fileUrlsList.get(i));
-                    centerdataTAttach.setFileType(filetype);
-                    centerdataTAttach.setBusId(attachId);
-                    centerdataTAttach.setBusSource(source);
-                    centerdataTAttach.setAttachPath(fileUrl);
-                    centerdataTAttach.setBusIndx(busindx);
-                    centerdataTAttach.setFileName(fileName);
-                    attach(centerdataTAttach);
-                    list.add(centerdataTAttach);
-                }
-                return list;
-            }
         }
         return list;
     }

src/main/java/com/sooka/sponest/data/utils/RegionalFlagUtil.java

@@ -10,13 +10,13 @@ import java.util.stream.Collectors;
 
 public class RegionalFlagUtil {
 
-    public static List<LatLngAndFlagType>  getRegionalFlag(List<RegionalFlag> regionalFlags,String eventId){
+    private RegionalFlagUtil() {
+        throw new IllegalStateException("Utility class");
+    }
 
+    public static List<LatLngAndFlagType> getRegionalFlag(List<RegionalFlag> regionalFlags, String eventId) {
         List<LatLngAndFlagType> list = new ArrayList<>();
-
-        Map<Long, List<RegionalFlag>> entityMap = regionalFlags.stream()
-                .collect(Collectors.groupingBy(RegionalFlag::getFlagType));//分类
-
+        Map<Long, List<RegionalFlag>> entityMap = regionalFlags.stream().collect(Collectors.groupingBy(RegionalFlag::getFlagType));//分类
         String name = "";
         for (Map.Entry<Long, List<RegionalFlag>> entry : entityMap.entrySet()) {
             List<RegionalFlag> typeEntities = entry.getValue();

src/main/java/com/sooka/sponest/data/utils/TreeUtil.java

@@ -9,6 +9,10 @@ import java.util.stream.Collectors;
 
 public class TreeUtil {
 
+    private TreeUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static List<Map<String, Object>> listToTree(List<Map<String, Object>> personList, List<Map<String, Object>> deptList) {
         Map<String, Map<String, Object>> map = new HashMap<>();// 使用Map来存储所有查询结果，以id为key
         for (Map<String, Object> item : deptList) {
@@ -18,14 +22,12 @@ public class TreeUtil {
         }
         // 分组
         MultiValueMap<String, Map<String, Object>> groupMap = new LinkedMultiValueMap();
-        personList.forEach(item -> {
-            groupMap.add(String.valueOf(item.get("id")), item);
-        });
+        personList.forEach(item -> groupMap.add(String.valueOf(item.get("id")), item));
         // 设置title
-        for (String key : groupMap.keySet()) {
-            Map<String, Object> result = map.get(key);
+        for (Map.Entry<String, List<Map<String, Object>>> entry : groupMap.entrySet()) {
+            Map<String, Object> result = map.get(entry.getKey());
             if (result != null) {
-                result.put("title", groupMap.get(key));
+                result.put("title", entry.getValue());
             }
         }
         // 构建树形结构
@@ -41,16 +43,14 @@ public class TreeUtil {
         }
         // 分组
         MultiValueMap<String, Map<String, Object>> groupMap = new LinkedMultiValueMap();
-        personList.forEach(item -> {
-            groupMap.add(String.valueOf(item.get("id")), item);
-        });
+        personList.forEach(item -> groupMap.add(String.valueOf(item.get("id")), item));
         // 设置title
         Set<String> grids = new HashSet<>();
-        for (String key : groupMap.keySet()) {
-            Map<String, Object> result = map.get(key);
+        for (Map.Entry<String, List<Map<String, Object>>> entry : groupMap.entrySet()) {
+            Map<String, Object> result = map.get(entry.getKey());
             if (result != null) {
-                result.put("title", groupMap.get(key));
-                grids.add(key);
+                result.put("title", entry.getValue());
+                grids.add(entry.getKey());
                 grids.addAll(Arrays.asList(String.valueOf(result.get("ancestors")).split(",")));
             }
         }