diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/CommonController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java similarity index 94% rename from src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/CommonController.java rename to src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java index 0115c25..9fe951f 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/CommonController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CommonController.java @@ -1,17 +1,11 @@ -package com.zcloud.controller.hiddenDangerCheckStandardLibrary; +package com.zcloud.controller.hiddenDangerCheckStandard; -import com.alibaba.fastjson.JSONArray; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.bus.HiddenCheckService; -import com.zcloud.service.bus.HiddenSchemeService; -import com.zcloud.service.bus.HiddenService; -import com.zcloud.service.bus.ImgFilesService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService; +import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import com.zcloud.util.*; -import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/DictionaryController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java similarity index 95% rename from src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/DictionaryController.java rename to src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java index 4e3066d..ada4a64 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandardLibrary/DictionaryController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/DictionaryController.java @@ -1,19 +1,16 @@ -package com.zcloud.controller.hiddenDangerCheckStandardLibrary; +package com.zcloud.controller.hiddenDangerCheckStandard; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; +import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; import com.zcloud.util.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java index 808c894..e64e891 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; +package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java index 42e55c4..c755055 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; +package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java index f37c2dc..4a4fee4 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary; +package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonItemService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonItemService.java similarity index 95% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonItemService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonItemService.java index 5c1d8f9..640e9ea 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonItemService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonItemService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java similarity index 95% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java index 41c6347..feb1e41 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/CommonService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CommonService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/DictionaryService.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java similarity index 95% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/DictionaryService.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java index 2c1d412..0fba90f 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/DictionaryService.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/DictionaryService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary; +package com.zcloud.service.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java similarity index 93% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonItemServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java index a881e77..ad2bfab 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonItemServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java @@ -1,13 +1,11 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonItemMapper; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonMapper; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; -import com.zcloud.util.Tools; +import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonItemMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CommonService; +import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; import com.zcloud.util.UuidUtil; import com.zcloud.util.Warden; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java similarity index 94% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java index a4dfe3e..1ab0abb 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/CommonServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java @@ -1,19 +1,15 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.alibaba.excel.EasyExcel; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.CommonMapper; -import com.zcloud.service.depository.impl.HiddenLibraryWarden; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonItemService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.CommonService; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; -import com.zcloud.service.system.DictionariesService; -import com.zcloud.util.ObjectExcelRead; +import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonMapper; +import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService; +import com.zcloud.service.hiddenDangerCheckStandard.CommonService; +import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; import com.zcloud.util.Tools; import com.zcloud.util.UuidUtil; import com.zcloud.util.Warden; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; /** * 说明:隐患排查标准表(通用) diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/DictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java similarity index 92% rename from src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/DictionaryServiceImpl.java rename to src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java index ba86c31..969a108 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandardLibrary/impl/DictionaryServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java @@ -1,12 +1,9 @@ -package com.zcloud.service.hiddenDangerCheckStandardLibrary.impl; +package com.zcloud.service.hiddenDangerCheckStandard.impl; -import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandardLibrary.DictionaryMapper; -import com.zcloud.service.hiddenDangerCheckStandardLibrary.DictionaryService; -import com.zcloud.util.Tools; -import com.zcloud.util.Warden; +import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.DictionaryMapper; +import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.xml b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonItemMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.xml rename to src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonItemMapper.xml index ea6f5bc..88a5e16 100644 --- a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonItemMapper.xml +++ b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonItemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.xml b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.xml rename to src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonMapper.xml index 370edf5..a68a3f8 100644 --- a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/CommonMapper.xml +++ b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/CommonMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.xml b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.xml rename to src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml index 70e63d4..eb2263d 100644 --- a/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandardLibrary/DictionaryMapper.xml +++ b/src/main/resources/mybatis/dsno2/hiddenDangerCheckStandard/DictionaryMapper.xml @@ -1,6 +1,6 @@ - +