From e5b2bfe2ba30646e4171b3cedcb413ce0e2d58f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 14 Apr 2020 15:46:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AA=E7=BF=BB=E8=AF=91=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysLocaleResourceService.java | 34 +++++++---- .../configuration/AppStartSystemInit.java | 26 +++++---- .../busi/SysLocaleResourceController.java | 49 +++++----------- .../controller/busi/SysLogOperateController.java | 7 ++- .../serviceimpl/busi/SysLocaleResourceService.java | 67 ++-------------------- 5 files changed, 60 insertions(+), 123 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java index 40305bd..f26c1ce 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java @@ -60,16 +60,28 @@ public interface ISysLocaleResourceService { @ApiOperation(value = "删除所有资源") void deleteSysLocaleResourceAll(); - /***************************** 缺失资源管理 ******************************/ - - List listMissResourceModel(); - - MissResourceModel saveMissResourceModel(MissResourceModel missResourceModel); - - void updateMissResourceModelIsValidByKeys(String[] keys, Integer isValid); - - void doCleanInValidMissResource(); - - void doConversionMissResourceByKeys(String[] keys); + /***************************** 缺失资源管理 ******************************/ + + /** + * 查询指定数量的缺失资源 + * @param num 数量 + * @return + */ + @ApiOperation(value = "查询指定数量的缺失资源") + List findMissResourceModelByTop(int num); + + /** + * 缺失资源key + * @param keys + */ + @ApiOperation(value = "根据key删除缺失资源信息") + void deleteInValidMissResourceByKeys(String[] keys); + + /** + * 批量转换缺失资源 + * @param missResourceModelList + */ + @ApiOperation(value = "批量转换缺失资源") + void doConversionMissResourceByKeys(List missResourceModelList) ; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 0cbb20d..880d871 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -62,20 +62,24 @@ public class AppStartSystemInit implements CommandLineRunner { @Override public void run(String... args) throws Exception { - LOGGER.info("【IMPP-Core开始绑定资源信息...】"); - packIMPPResources(); + try { + LOGGER.info("【IMPP-Core开始绑定资源信息...】"); + packIMPPResources(); - LOGGER.info("【IMPP-Core开始加载基础信息...】"); - systemInitService.putAndLoadAll(); + LOGGER.info("【IMPP-Core开始加载基础信息...】"); + systemInitService.putAndLoadAll(); - // 加载系统配置文件 - LOGGER.info("【IMPP-Core 加载系统配置文件到缓存中 ...】"); - systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode()); - LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】"); + // 加载系统配置文件 + LOGGER.info("【IMPP-Core 加载系统配置文件到缓存中 ...】"); + systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode()); + LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】"); - LOGGER.info("【IMPP-Core 加载 ElasticSearch中 ...】"); - initImppElasticSearch(); - LOGGER.info("【IMPP-Core 加载 ElasticSearch完成】"); + LOGGER.info("【IMPP-Core 加载 ElasticSearch中 ...】"); + initImppElasticSearch(); + LOGGER.info("【IMPP-Core 加载 ElasticSearch完成】"); + } catch (Exception e){ + e.printStackTrace(); + } } /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index d6d63db..e8d840d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.BaseImppException; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.ExcelTool; +import cn.estsh.i3plus.platform.common.tool.FileTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.FileContentTypeTool; @@ -43,7 +44,10 @@ import javax.persistence.EntityManager; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -531,7 +535,7 @@ public class SysLocaleResourceController extends CoreBaseController { @ApiOperation(value = "缺失资源列表") public ResultBean listMissResource(){ try { - List missResourceModelList = sysLocaleResourceService.listMissResourceModel(); + List missResourceModelList = sysLocaleResourceService.findMissResourceModelByTop(100); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(missResourceModelList); } catch (ImppBusiException busExcep) { @@ -541,39 +545,11 @@ public class SysLocaleResourceController extends CoreBaseController { } } - @PutMapping(value = "/miss/update") - @ApiOperation(value = "更新缺失资源信息") - public ResultBean listMissResource(MissResourceModel missResourceModel){ - try { - missResourceModel = sysLocaleResourceService.saveMissResourceModel(missResourceModel); - - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(missResourceModel); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - - @PutMapping(value = "/miss/batch-update-valid") - @ApiOperation(value = "更新缺失资源有效状态") - public ResultBean updateMissResourceIsValidByKeys(String[] keys,Integer valid){ - try { - sysLocaleResourceService.updateMissResourceModelIsValidByKeys(keys, valid); - - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } catch (Exception e) { - return ImppExceptionBuilder.newInstance().buildExceptionResult(e); - } - } - @DeleteMapping(value = "/miss/clean-invalid") @ApiOperation(value = "更新缺失资源有效状态") - public ResultBean cleanMissResourceByInvalid(){ + public ResultBean cleanMissResourceByInvalid(String[] keys){ try { - sysLocaleResourceService.doCleanInValidMissResource(); + sysLocaleResourceService.deleteInValidMissResourceByKeys(keys); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -585,9 +561,9 @@ public class SysLocaleResourceController extends CoreBaseController { @PostMapping(value = "/miss/batch-conversion") @ApiOperation(value = "批量转换缺失资源") - public ResultBean doBatchConversionMissResource(String[] keys){ + public ResultBean doBatchConversionMissResource(@RequestBody List missResourceModelList){ try { - sysLocaleResourceService.doConversionMissResourceByKeys(keys); + sysLocaleResourceService.doConversionMissResourceByKeys(missResourceModelList); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -601,7 +577,7 @@ public class SysLocaleResourceController extends CoreBaseController { @ApiOperation(value = "导出缺失资源") public ResultBean exportMissResource(HttpServletResponse response){ try { - List missResourceModelList = sysLocaleResourceService.listMissResourceModel(); + List missResourceModelList = sysLocaleResourceService.findMissResourceModelByTop(-1); Map langCodeMap = sysLocaleLanguageService.listSysLocaleLanguage() .stream() .collect( @@ -627,9 +603,10 @@ public class SysLocaleResourceController extends CoreBaseController { } ExcelTool excelTool = new ExcelTool(entityManager, redisRes); + String tempDir = FileTool.makeTempFolder(); String fileName = "locale_" + System.currentTimeMillis() + ".xls"; - File file = new File(fileName); + File file = new File(tempDir,fileName); if (file.createNewFile()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index f65b2c2..ece1c5f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -21,13 +21,14 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; 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.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.persistence.EntityManager; @@ -257,7 +258,7 @@ public class SysLogOperateController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } finally { // 清理临时文件文件 - if(excelDir == null) { + if(excelDir != null) { FileTool.deleteFile(excelDir.getPath()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index 5265500..38f380f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -22,7 +22,6 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -232,8 +231,8 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { } @Override - public List listMissResourceModel() { - List listStr = redisRes.scan(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*"); + public List findMissResourceModelByTop(int num) { + List listStr = redisRes.scan(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*",num); MissResourceModel missResourceModel = null; List missResourceModelList = new ArrayList<>(listStr.size()); @@ -253,59 +252,12 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { } @Override - public MissResourceModel saveMissResourceModel(MissResourceModel missResourceModel) { - redisRes.putObject(missResourceModel.getKey(), JSON.toJSONString(missResourceModel), -1); - return missResourceModel; + public void deleteInValidMissResourceByKeys(String[] keys) { + redisRes.deleteKey(keys); } @Override - public void updateMissResourceModelIsValidByKeys(String[] keys, Integer valid) { - List missResourceStrList = redisRes.findObject(Arrays.asList(keys)); - MissResourceModel missResourceModel = null; - List missResourceModelList = new ArrayList<>(missResourceStrList.size()); - - // 更新状态 - for (Object missResourceStr : missResourceStrList) { - if (missResourceStr == null || StringUtils.isBlank(missResourceStr.toString())) { - continue; - } - missResourceModel = JsonUtilTool.decode(missResourceStr.toString(), MissResourceModel.class); - missResourceModel.setIsValid(valid); - missResourceModelList.add(missResourceModel); - } - - // 存入redis - for (MissResourceModel resourceModel : missResourceModelList) { - redisRes.putObject(resourceModel.getKey(), JsonUtilTool.encode(resourceModel)); - } - } - - @Override - public void doCleanInValidMissResource() { - List listStr = redisRes.scan(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*"); - MissResourceModel missResourceModel = null; - List cleanKeys = new ArrayList<>(listStr.size()); - - // 更新状态 - for (Object missResourceStr : listStr) { - if (missResourceStr ==null || StringUtils.isBlank(missResourceStr.toString())) { - continue; - } - missResourceModel = JsonUtilTool.decode(missResourceStr.toString(), MissResourceModel.class); - - if (missResourceModel != null && missResourceModel.getIsValid() != null - && CommonEnumUtil.IS_VAILD.INVAILD.getValue() == missResourceModel.getIsValid()) { - cleanKeys.add(missResourceModel.getKey()); - } - } - redisRes.deleteKey(cleanKeys.toArray(new String[cleanKeys.size()])); - } - - @Override - public void doConversionMissResourceByKeys(String[] keys) { - List missResourceStrList = redisRes.findObject(Arrays.asList(keys)); - MissResourceModel missResourceModel = null; - List missResourceModelList = new ArrayList<>(missResourceStrList.size()); + public void doConversionMissResourceByKeys(List missResourceModelList) { Map langCodeMap = sysLocaleLanguageRDao.list() .stream() .collect( @@ -315,15 +267,6 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { ) ); - // 类型转换 - for (Object missResourceStr : missResourceStrList) { - if (missResourceStr == null || StringUtils.isBlank(missResourceStr.toString())) { - continue; - } - missResourceModel = JsonUtilTool.decode(missResourceStr.toString(), MissResourceModel.class); - missResourceModelList.add(missResourceModel); - } - SysLocaleResource sysLocaleResource; for (MissResourceModel resourceModel : missResourceModelList) { sysLocaleResource = new SysLocaleResource(); From acae46c4082bb25e29bb4420265151abcfbc38cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 18 Apr 2020 17:00:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Sonar=E4=BB=A3=E7=A0=81=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8B=A6=E6=88=AA=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=20=E8=A1=A8=E5=8D=95-?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9B=AE=E5=BD=95=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/auth/realm/DefaultModularRealm.java | 5 +- .../configuration/AppStartSystemInit.java | 169 +-------------------- .../apiservice/controller/DemoAuthController.java | 2 +- .../apiservice/controller/base/AuthController.java | 3 +- .../controller/base/BackstageController.java | 6 - .../controller/base/WhiteController.java | 4 +- .../controller/report/CoreReportController.java | 2 +- .../core/apiservice/schedulejob/DemoCloudJob.java | 2 +- .../serviceimpl/busi/CoreMemTreeService.java | 167 ++++++++++---------- .../serviceimpl/busi/CoreTreeService.java | 27 ---- .../serviceimpl/busi/DataMoreService.java | 2 +- .../serviceimpl/busi/SysDictionaryService.java | 2 +- .../core/apiservice/thread/CoreDemoThread.java | 12 +- .../core/apiservice/util/BarcodeParseUtil.java | 3 +- 14 files changed, 105 insertions(+), 301 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.java index c7c1c9d..1daaac7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.java @@ -24,13 +24,14 @@ import java.util.Map; * @Modify: **/ public class DefaultModularRealm extends ModularRealmAuthenticator { - private static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultModularRealm.class); private Map definedRealms; public DefaultModularRealm(Map definedRealms) { this.definedRealms = definedRealms; } + @Override protected AuthenticationInfo doMultiRealmAuthentication(Collection realms, AuthenticationToken token) { return super.doMultiRealmAuthentication(realms, token); } @@ -43,6 +44,7 @@ public class DefaultModularRealm extends ModularRealmAuthenticator { this.definedRealms = definedRealms; } + @Override protected AuthenticationInfo doAuthenticate(AuthenticationToken token) throws AuthenticationException { Realm realm; if (token instanceof SaAdminToken) { @@ -61,6 +63,7 @@ public class DefaultModularRealm extends ModularRealmAuthenticator { return this.doSingleRealmAuthentication(realm, token); } + @Override protected AuthenticationInfo doSingleRealmAuthentication(Realm realm, AuthenticationToken token) { if (!realm.supports(token)) { throw new AuthenticationException("TOKEN类型异常，请联系管理员"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 756ad71..2b07c8b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -40,7 +40,7 @@ public class AppStartSystemInit implements CommandLineRunner { private static Environment environment; @Value("${spring.profiles.active}") - public String SPRING_PROFILES_ACTIVE; + public String springProfilesActive; // 限制组织数量 public static int organizeCount = 5; // 限制账号数量 @@ -66,9 +66,6 @@ public class AppStartSystemInit implements CommandLineRunner { @Override public void run(String... args) throws Exception { try { - LOGGER.info("【IMPP-Core开始绑定资源信息...】"); - packIMPPResources(); - LOGGER.info("【IMPP-Core开始加载基础信息...】"); systemInitService.putAndLoadAll(); @@ -124,168 +121,4 @@ public class AppStartSystemInit implements CommandLineRunner { } } - /** - * 初始化资源信息，并缓存 - * 调整至cn.estsh.i3plus.core.apiservice.serviceimpl.base.SystemInitService - */ - public void packIMPPResources() { -// /** -// * 整体数据结构： -// * code -// * 先根据code查询，判断是否存在，然后通过语言获取对应的值 -// */ -// HashMap> resMap = new HashMap(); -// HashMap lanMap = null; -// HashMap> webLangMap = new HashMap<>(); -// HashMap webResMap; -// -// //语言数量 -// List langList = systemResourceService.listSysLocaleLanguage(null); -// -// //查询所有资源 -// List resourceList = systemResourceService.listSysLocaleResource(null); -// LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。", resourceList.size(), langList.size()); -// for (SysLocaleResource res : resourceList) { -// //遍历资源，放入map中 -// lanMap = resMap.get(res.getResourceKey()); -// //判断是否已存在资源信息 -// if (lanMap == null) { -// lanMap = new HashMap(); -// //将key/代码放入 -// resMap.put(res.getResourceKey(), lanMap); -// } -// //根据语言放入 -// lanMap.put(res.getLanguageCode(), res.getResourceValue()); -// -// // web 资源 -// if (!webLangMap.containsKey(res.getLanguageCode())) { -// webLangMap.put(res.getLanguageCode(), new HashMap<>()); -// } -// // 放入资源信息 -// webResMap = webLangMap.get(res.getLanguageCode()); -// webResMap.put(res.getResourceKey(), res.getResourceValue()); -// } -// -// for (String key : resMap.keySet()) { -// //放入缓存 -// redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, resMap.get(key), 0); -// } -// -// for (String key : webLangMap.keySet()) { -// //放入缓存 -// redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, webLangMap.get(key), 0); -// } -// -// LOGGER.info("【资源配置文件已全部加载：{}个】", resMap.size()); - - /* - //资源集合 - HashMap resMap; - - //模块集合 - HashMap> langModoleMap = new HashMap(); - //功能集合 - HashMap> langMethodMap = new HashMap(); - //按钮集合 - HashMap> langBtnMap = new HashMap(); - //信息集合 - HashMap> langMsgMap = new HashMap(); - //异常集合 - HashMap> langExMap = new HashMap(); - - *//************** 加载国际化 *************//* - for(SysLocaleLanguage lang : langList) { - *//************** 加载模块 *************//* - resource = new SysLocaleResource(); - resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MODULE.getValue()); - resource.setLanguageCode(lang.getLanguageCode()); - resourceList = systemResourceService.listSysLocaleResource(resource); - - if(resourceList.size() > 0) { - LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MODULE.getDescription(), - lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); - } - resMap = new HashMap(); - for(SysLocaleResource res : resourceList){ - resMap.put(res.getResourceKey(),res.getResourceValue()); - } - langModoleMap.put(lang.getLanguageCode(),resMap); - - *//************** 加载功能 *************//* - resource = new SysLocaleResource(); - resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.METHOD.getValue()); - resource.setLanguageCode(lang.getLanguageCode()); - resourceList = systemResourceService.listSysLocaleResource(resource); - - if(resourceList.size() > 0) { - LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.METHOD.getDescription(), - lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); - } - - resMap = new HashMap(); - for(SysLocaleResource res : resourceList){ - resMap.put(res.getResourceKey(),res.getResourceValue()); - } - langMethodMap.put(lang.getLanguageCode(),resMap); - - *//************** 加载按钮 *************//* - resource = new SysLocaleResource(); - resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.BUTTON.getValue()); - resource.setLanguageCode(lang.getLanguageCode()); - resourceList = systemResourceService.listSysLocaleResource(resource); - - if(resourceList.size() > 0) { - LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.BUTTON.getDescription(), - lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); - } - - resMap = new HashMap(); - for(SysLocaleResource res : resourceList){ - resMap.put(res.getResourceKey(),res.getResourceValue()); - } - langBtnMap.put(lang.getLanguageCode(),resMap); - - *//************** 加载资源 *************//* - resource = new SysLocaleResource(); - resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.COMMON.getValue()); - resource.setLanguageCode(lang.getLanguageCode()); - resourceList = systemResourceService.listSysLocaleResource(resource); - - if(resourceList.size() > 0) { - LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.COMMON.getDescription(), - lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); - } - resMap = new HashMap(); - for(SysLocaleResource res : resourceList){ - resMap.put(res.getResourceKey(),res.getResourceValue()); - } - langMsgMap.put(lang.getLanguageCode(),resMap); - - *//************** 加载异常 *************//* - resource = new SysLocaleResource(); - resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION.getValue()); - resource.setLanguageCode(lang.getLanguageCode()); - resourceList = systemResourceService.listSysLocaleResource(resource); - - if(resourceList.size() > 0) { - LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION.getDescription(), - lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); - } - resMap = new HashMap(); - for(SysLocaleResource res : resourceList){ - resMap.put(res.getResourceKey(),res.getResourceValue()); - } - langExMap.put(lang.getLanguageCode(),resMap); - } - - redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE,langModoleMap); - redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_METHOD,langMethodMap); - redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_BUTTON,langBtnMap); - redisCore.putHashMap(CommonConstWords.RES_LANGUAGE_CONVERT,langMsgMap); - redisCore.putHashMap(CommonConstWords.RES_EXCEPTION_CONVERT,langExMap); - - LOGGER.info("【资源配置文件已全部加载】");*/ - } - - } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index c0f378b..737eae2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -89,7 +89,7 @@ public class DemoAuthController extends CoreBaseController { while (headerNames.hasMoreElements()) { String key = (String) headerNames.nextElement(); String value = request.getHeader(key); - System.out.println("k : " + key + " , v : " + value); + LOGGER.info("k : {} , v : {}", key, value); } return new ResultBean(true, "", sUser); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index ef60842..f3af991 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -23,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; + import java.util.Comparator; import java.util.List; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java index c183bda..235cb60 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -5,16 +5,12 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogElasticSearchService; import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService; -import cn.estsh.i3plus.platform.common.tool.SerializeTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; import cn.estsh.i3plus.platform.plugin.license.ImppLicense; import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -25,7 +21,6 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -37,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; -import java.util.List; /** * @Description : 后台服务 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 34e0081..1680d84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -520,12 +520,12 @@ public class WhiteController extends CoreBaseController { } @PostMapping(value = "/miss-resource/get") - @ApiOperation(value = "根据条件分页查询账号信息", notes = "根据条件分页查询账号信息") + @ApiOperation(value = "缺失资源", notes = "缺失资源") public ResultBean getMissResourceByKey(String key,String soft){ try { LocaleUtils.saveMissResource(key, AuthUtil.getSessionLanguage().toString(), CommonEnumUtil.SOFT_TYPE.descOf(soft), CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(), - CommonEnumUtil.MiSS_RESOURCE_SOURCE.SERVER.getValue()); + CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java index 20e5d83..bc7d5d0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java @@ -135,7 +135,7 @@ public class CoreReportController extends CoreBaseController { LOGGER.info("【类信息：{}】", clzNameList); List clzList = new ArrayList<>(clzNameList.size()); for (String clzName : clzNameList) { - ClassModel model = ClassTool.getClassModel(clzName); + ClassTool.getClassModel(clzName); } return ResultBean.success("获取类：" + clzList.size()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(clzList); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java index a3ee160..769194a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java @@ -27,7 +27,7 @@ public class DemoCloudJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - System.out.println("==============测试微服定时任务demo==========="); + LOGGER.info("==============测试微服定时任务demo==========="); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 1008346..f140356 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -35,10 +36,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysPosition(List list, Long parentId) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { List copyList = new ArrayList<>(list); list.forEach(position -> { - if(position.getParentId() != null && position.getParentId().equals(parentId)){ + if (position.getParentId() != null && position.getParentId().equals(parentId)) { result.add(position); copyList.remove(position); position.setChildList(packTreeSysPosition(copyList, position.getId())); @@ -51,11 +52,11 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List packTreeSysPositionBySysRefUserPosition(List list, List refList) { - List ids = new ArrayList<>(refList.size()); - - if(refList != null && refList.size() > 0){ - refList.forEach(ref -> ids.add(ref.getPositionId())); + if (refList == null || refList.isEmpty()) { + return Collections.emptyList(); } + List ids = new ArrayList<>(refList.size()); + refList.forEach(ref -> ids.add(ref.getPositionId())); return packTreeSysPositionByIds(list, ids); } @@ -64,15 +65,15 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysPositionByIds(List list, List ids) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { list.forEach(position -> { - if(position.getChildList() == null || position.getChildList().size() <= 0){ - if(ids.contains(position.getId())){ + if (position.getChildList() == null || position.getChildList().size() <= 0) { + if (ids.contains(position.getId())) { result.add(position); } - }else{ + } else { List childList = packTreeSysPositionByIds(position.getChildList(), ids); - if(ids.contains(position.getId()) || childList != null && childList.size() > 0){ + if (ids.contains(position.getId()) || childList != null && childList.size() > 0) { position.setChildList(childList); result.add(position); } @@ -85,9 +86,9 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public SysPosition packTreeSysPositionById(List list, Long id) { - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysPosition position : list) { - if(position.getId().equals(id)){ + if (position.getId().equals(id)) { position.setChildList(packTreeSysPosition(list, position.getId())); return position; } @@ -100,7 +101,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List findChildSysPosition(SysPosition position) { List result = new ArrayList<>(); - if(position != null && position.getChildList() != null && position.getChildList().size() > 0){ + if (position != null && position.getChildList() != null && position.getChildList().size() > 0) { for (SysPosition sp : position.getChildList()) { result.add(sp.getId()); List list = findChildSysPosition(sp); @@ -114,16 +115,16 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List findSysPositionChildIdList(Long id) { SysPosition position = personnelService.getSysPositionById(id); - if(position != null){ + if (position != null) { List list = personnelService.findSysPositionList(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { SysPosition treeSPosition = packTreeSysPositionById(list, position.getId()); List idList = findChildSysPosition(treeSPosition); idList.add(position.getId()); return idList; } } - return null; + return Collections.emptyList(); } /********************************************* Start SysOrganize Tree *********************************************/ @@ -131,10 +132,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysOrganize(List list, Long parentId) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { List copyList = new ArrayList<>(list); list.forEach(organize -> { - if(organize.getParentId() != null && organize.getParentId().equals(parentId)){ + if (organize.getParentId() != null && organize.getParentId().equals(parentId)) { result.add(organize); copyList.remove(organize); organize.setChildList(packTreeSysOrganize(copyList, organize.getId())); @@ -149,7 +150,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysOrganizeBySysRefUserOrganize(List list, List refList) { List ids = new ArrayList<>(refList.size()); - if(refList != null && refList.size() > 0){ + if (refList != null && refList.size() > 0) { refList.forEach(ref -> ids.add(ref.getOrganizeId())); } @@ -160,8 +161,8 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysOrganizeBySysRefUserInfoOrganize(List list, List refList) { List ids = new ArrayList<>(refList.size()); - if(refList != null && refList.size() > 0){ - refList.forEach(ref ->{ + if (refList != null && refList.size() > 0) { + refList.forEach(ref -> { ids.add(ref.getOrganizeId()); }); } @@ -173,15 +174,15 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysOrganizeByIds(List list, List ids) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { list.forEach(organize -> { - if(organize.getChildList() == null || organize.getChildList().size() <= 0){ - if(ids.contains(organize.getId())){ + if (organize.getChildList() == null || organize.getChildList().size() <= 0) { + if (ids.contains(organize.getId())) { result.add(organize); } - }else{ + } else { List childList = packTreeSysOrganizeByIds(organize.getChildList(), ids); - if(ids.contains(organize.getId()) || childList != null && childList.size() > 0){ + if (ids.contains(organize.getId()) || childList != null && childList.size() > 0) { organize.setChildList(childList); result.add(organize); } @@ -194,9 +195,9 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public SysOrganize packTreeSysOrganizeById(List list, Long id) { - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysOrganize organize : list) { - if(organize.getId().equals(id)){ + if (organize.getId().equals(id)) { organize.setChildList(packTreeSysOrganize(list, organize.getId())); return organize; } @@ -208,14 +209,14 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public SysOrganize getTreeSysOrganizeById(List list, Long id) { SysOrganize result = null; - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysOrganize organize : list) { - if(organize.getId().equals(id)){ + if (organize.getId().equals(id)) { result = organize; - } else if(organize.getChildList() != null && organize.getChildList().size() > 0){ + } else if (organize.getChildList() != null && organize.getChildList().size() > 0) { result = getTreeSysOrganizeById(organize.getChildList(), id); } - if(result != null){ + if (result != null) { return result; } } @@ -227,8 +228,8 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List findChildSysOrganize(SysOrganize organize) { List result = new ArrayList<>(); - if(organize != null){ - if(organize.getChildList() != null && organize.getChildList().size() > 0){ + if (organize != null) { + if (organize.getChildList() != null && organize.getChildList().size() > 0) { for (SysOrganize so : organize.getChildList()) { result.add(so.getId()); result.addAll(findChildSysOrganize(so)); @@ -243,16 +244,16 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List findSysOrganizeChildIdList(Long id) { SysOrganize organize = personnelService.getSysOrganizeById(id); - if(organize != null){ + if (organize != null) { List list = personnelService.findSysOrganizeList(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { SysOrganize treeSPosition = packTreeSysOrganizeById(list, organize.getId()); List idList = findChildSysOrganize(treeSPosition); idList.add(organize.getId()); return idList; } } - return null; + return Collections.emptyList(); } /********************************************* End SysOrganize Tree *********************************************/ @@ -262,15 +263,15 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List packTreeTreeModelByRefUserDepartment(List organizeList, List departmentList, List refList) { - if(refList != null && organizeList != null && departmentList != null){ + if (refList != null && organizeList != null && departmentList != null) { List organizeIdList = new ArrayList<>(); List departmentIdList = new ArrayList<>(); refList.forEach(ref -> { - if(!organizeIdList.contains(ref.getOrganizeId())){ + if (!organizeIdList.contains(ref.getOrganizeId())) { organizeIdList.add(ref.getOrganizeId()); } - if(!departmentIdList.contains(ref.getDepartmentId())){ + if (!departmentIdList.contains(ref.getDepartmentId())) { departmentIdList.add(ref.getDepartmentId()); } }); @@ -286,7 +287,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { return result; } - return null; + return Collections.emptyList(); } @Override @@ -324,7 +325,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeTreeModelSysOrganize(List list) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysOrganize organize : list) { CommonTreeModel model = new CommonTreeModel(); model.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_ORGANIZE.getValue()); @@ -342,7 +343,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeTreeModelSysDepartment(List list) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysDepartment department : list) { CommonTreeModel model = new CommonTreeModel(); model.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_DEPARTMENT.getValue()); @@ -358,12 +359,12 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List packTreeTreeModel(List list, List departmentList) { - if(list != null && list.size() > 0 && departmentList != null && departmentList.size() > 0){ + if (list != null && list.size() > 0 && departmentList != null && departmentList.size() > 0) { list.forEach(model -> { SysOrganize organize = (SysOrganize) model.getBean(); List departments = new ArrayList<>(); departmentList.forEach(department -> { - if(department.getParentId().equals(CommonEnumUtil.PARENT.DEFAULT.getValue()) && department.getOrganizeId().equals(organize.getId())){ + if (department.getParentId().equals(CommonEnumUtil.PARENT.DEFAULT.getValue()) && department.getOrganizeId().equals(organize.getId())) { departments.add(department); } }); @@ -387,9 +388,9 @@ public class CoreMemTreeService implements ICoreMemTreeService { refList.forEach(ref -> refFilterIds.add(ref.getDepartmentId())); } - if(refIdList.size() <= 0){ + if (refIdList.size() <= 0) { refIdList = refFilterIds; - }else { + } else { // List 取交集 refIdList = (ArrayList) CollectionUtils.intersection(refIdList, refFilterIds); } @@ -429,10 +430,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysDepartment(List list, Long parentId) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { List copyList = new ArrayList<>(list); list.forEach(department -> { - if(department.getParentId() != null && department.getParentId().equals(parentId)){ + if (department.getParentId() != null && department.getParentId().equals(parentId)) { result.add(department); copyList.remove(department); department.setChildList(packTreeSysDepartment(copyList, department.getId())); @@ -447,7 +448,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysDepartmentBySysRefUserOrganize(List list, List refList) { List ids = new ArrayList<>(refList.size()); - if(refList != null && refList.size() > 0){ + if (refList != null && refList.size() > 0) { refList.forEach(ref -> ids.add(ref.getDepartmentId())); } @@ -458,7 +459,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysDepartmentBySysRefUserInfoOrganize(List list, List refList) { List ids = new ArrayList<>(refList.size()); - if(refList != null && refList.size() > 0){ + if (refList != null && refList.size() > 0) { refList.forEach(ref -> ids.add(ref.getDepartmentId())); } @@ -469,15 +470,15 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysDepartmentByIds(List list, List ids) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { list.forEach(department -> { - if(department.getChildList() == null || department.getChildList().size() <= 0){ - if(ids.contains(department.getId())){ + if (department.getChildList() == null || department.getChildList().size() <= 0) { + if (ids.contains(department.getId())) { result.add(department); } - }else{ + } else { List childList = packTreeSysDepartmentByIds(department.getChildList(), ids); - if(ids.contains(department.getId()) || childList != null && childList.size() > 0){ + if (ids.contains(department.getId()) || childList != null && childList.size() > 0) { department.setChildList(childList); result.add(department); } @@ -490,9 +491,9 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public SysDepartment packTreeSysDepartmentById(List list, Long id) { - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysDepartment department : list) { - if(department.getId().equals(id)){ + if (department.getId().equals(id)) { department.setChildList(packTreeSysDepartment(list, department.getId())); return department; } @@ -505,7 +506,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List findChildSysDepartment(SysDepartment department) { List result = new ArrayList<>(); - if(department != null && department.getChildList() != null && department.getChildList().size() > 0){ + if (department != null && department.getChildList() != null && department.getChildList().size() > 0) { for (SysDepartment dep : department.getChildList()) { result.add(dep.getId()); result.addAll(findChildSysDepartment(dep)); @@ -518,16 +519,16 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List findSysDepartmentChildIdList(Long id) { SysDepartment department = personnelService.getSysDepartmentById(id); - if(department != null){ + if (department != null) { List list = personnelService.findSysDepartmentList(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { SysDepartment treeDep = packTreeSysDepartmentById(list, department.getId()); List idList = findChildSysDepartment(treeDep); idList.add(department.getId()); return idList; } } - return null; + return Collections.emptyList(); } /********************************************* End SysDepartment Tree *********************************************/ @@ -537,10 +538,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysMenu(List list, Long parentId) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { List copyList = new ArrayList<>(list); list.forEach(menu -> { - if(menu.getParentId() != null && menu.getParentId().equals(parentId)){ + if (menu.getParentId() != null && menu.getParentId().equals(parentId)) { result.add(menu); copyList.remove(menu); menu.setChildList(packTreeSysMenu(copyList, menu.getId())); @@ -555,7 +556,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysMenuBySysRefRoleMenu(List list, List refList) { List ids = new ArrayList<>(refList.size()); - if(refList != null && refList.size() > 0){ + if (refList != null && refList.size() > 0) { refList.forEach(ref -> ids.add(ref.getMenuId())); } @@ -566,15 +567,15 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysMenuByIds(List list, List ids) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { list.forEach(menu -> { - if(menu.getChildList() == null || menu.getChildList().size() <= 0){ - if(ids.contains(menu.getId())){ + if (menu.getChildList() == null || menu.getChildList().size() <= 0) { + if (ids.contains(menu.getId())) { result.add(menu); } - }else{ + } else { List childList = packTreeSysMenuByIds(menu.getChildList(), ids); - if(ids.contains(menu.getId()) || childList != null && childList.size() > 0){ + if (ids.contains(menu.getId()) || childList != null && childList.size() > 0) { menu.setChildList(childList); result.add(menu); } @@ -587,9 +588,9 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public SysMenu packTreeSysMenuById(List list, Long id) { - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysMenu menu : list) { - if(menu.getId().equals(id)){ + if (menu.getId().equals(id)) { menu.setChildList(packTreeSysMenu(list, menu.getId())); return menu; } @@ -602,7 +603,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List findChildSysMenu(SysMenu menu) { List result = new ArrayList<>(); - if(menu != null && menu.getChildList() != null && menu.getChildList().size() > 0){ + if (menu != null && menu.getChildList() != null && menu.getChildList().size() > 0) { for (SysMenu sp : menu.getChildList()) { result.add(sp.getId()); result.addAll(findChildSysMenu(sp)); @@ -621,28 +622,28 @@ public class CoreMemTreeService implements ICoreMemTreeService { public List packTreeSysMenuByUserIdAndParentId(Long userId, Long parentId) { List roleList = personnelService.findSysRefUserRole(userId); - if(roleList != null && roleList.size() > 0){ + if (roleList != null && roleList.size() > 0) { List refRoleMenuList = personnelService.findSysRefRoleMenuByRefUserRole(roleList); - if(refRoleMenuList != null && refRoleMenuList.size() > 0){ - List menuList = menuService.findLanguageMenuByMenuAndInId(null,null); + if (refRoleMenuList != null && refRoleMenuList.size() > 0) { + List menuList = menuService.findLanguageMenuByMenuAndInId(null, null); List menuRootTree = packTreeSysMenu(menuList, parentId); return packTreeSysMenuBySysRefRoleMenu(menuRootTree, refRoleMenuList); } } - return null; + return Collections.emptyList(); } @Override - public List packTreeSysMenuByParentIdAndMenuType(List list,Long parentId, Integer menuType) { + public List packTreeSysMenuByParentIdAndMenuType(List list, Long parentId, Integer menuType) { List result = new ArrayList<>(); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (SysMenu menu : list) { - if(menu.getChildList() != null && menu.getChildList().size() > 0){ + if (menu.getChildList() != null && menu.getChildList().size() > 0) { result.addAll(packTreeSysMenuByParentIdAndMenuType(menu.getChildList(), parentId, menuType)); } - if(menu.getParentId().equals(parentId) && menu.getMenuType().equals(menuType)){ + if (menu.getParentId().equals(parentId) && menu.getMenuType().equals(menuType)) { result.add(menu); } } @@ -653,7 +654,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List packTreeSysMenu() { - List menuList = menuService.findLanguageMenuByMenuAndInId(null,null); + List menuList = menuService.findLanguageMenuByMenuAndInId(null, null); return packTreeSysMenu(menuList, CommonEnumUtil.PARENT.DEFAULT.getValue()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index a6f7ee4..73b7296 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -610,37 +610,10 @@ public class CoreTreeService implements ICoreTreeService { private List findSysDepartmentCacheByHqlWhere(String hql) { return departmentRDao.findByHqlWhere(hql); -// if(!StringUtils.isBlank(hql)){ -// String redisKey = CommonConstWords.REDIS_PREFIX_CACHE_DEPARTMENT+ "_findCacheByHqlWhere" + "_" + hql.hashCode(); -// List list = redisCore.getList(redisKey, 0, -1); -// if(list == null){ -// list = departmentRDao.findByHqlWhere(hql); -// if(list != null){ -// redisCore.putList(redisKey,list,CommonConstWords.REDIS_TIME_DAY_ONE); -// } -// } -// return list; -// }else { -// return null; -// } } private List findSysOrganizeCacheByHqlWhere(String hql) { return organizeRDao.findByHqlWhere(hql); - -// if(!StringUtils.isBlank(hql)){ -// String redisKey = CommonConstWords.REDIS_PREFIX_CACHE_ORGANIZE+ "_findCacheByHqlWhere" + "_" + hql.hashCode(); -// List list = redisCore.getList(redisKey, 0, -1); -// if(list == null){ -// list = organizeRDao.findByHqlWhere(hql); -// if(list != null){ -// redisCore.putList(redisKey,list,CommonConstWords.REDIS_TIME_DAY_ONE); -// } -// } -// return list; -// }else { -// return null; -// } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreService.java index 21ceb3a..56d1286 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreService.java @@ -14,5 +14,5 @@ import org.springframework.stereotype.Service; **/ @Service public class DataMoreService implements IDataMoreService { - private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + public static final Logger LOGGER = LoggerFactory.getLogger(DataMoreService.class); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index d7e33fa..8a80169 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -195,7 +195,7 @@ public class SysDictionaryService implements ISysDictionaryService { List list = findSysDictionaryBySoftTypeAndParentCode(CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_FILE_TYPE); - if (list != null && list.size() > 0) { + if (list != null && !list.isEmpty()) { String suffix = StringTool.getStringFileSuffix(fileName, true); for (SysDictionary dictionary : list) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/thread/CoreDemoThread.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/thread/CoreDemoThread.java index 4073248..14e0df7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/thread/CoreDemoThread.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/thread/CoreDemoThread.java @@ -24,25 +24,25 @@ public class CoreDemoThread extends BaseThread { private String param; - public CoreDemoThread(String param){ + public CoreDemoThread(String param) { this.param = param; - IPersonnelService personnelService = ( IPersonnelService ) SpringContextsUtil.getBean(IPersonnelService.class); - LOGGER.info("spring容器获取服务：{}" + personnelService); + IPersonnelService personnelService = (IPersonnelService) SpringContextsUtil.getBean(IPersonnelService.class); + LOGGER.info("spring容器获取服务：{}", personnelService); WebApplicationContext webAppContext = WebApplicationContextUtils.getWebApplicationContext(ServletContextUtil.getServletContext()); ISysMessageService sysMessageService = webAppContext.getBean(ISysMessageService.class); - LOGGER.info("servlet容器获取服务：{}" + sysMessageService); + LOGGER.info("servlet容器获取服务：{}", sysMessageService); } @Override public boolean doRun() { //处理业务逻辑 - System.out.println("线程执行：获取参数" + param); + LOGGER.info("线程执行：获取参数" + param); return true; } //使用方式 - public static void main(String[] args){ + public static void main(String[] args) { ImppThreadPool.getThreadExcutorService().execute(new CoreDemoThread("thread param")); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java index dc49a84..cdeb3aa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -1,9 +1,10 @@ package cn.estsh.i3plus.core.apiservice.util; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; + import java.util.HashMap; import java.util.Map; From a4016874490b375f80772be2c2521f4d927dc065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 26 Apr 2020 10:33:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/base/WhiteController.java | 16 ++++++++++++++-- .../apiservice/serviceimpl/base/SystemInitService.java | 6 +++--- .../core/apiservice/serviceimpl/busi/SysMenuService.java | 11 ++++++++--- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 1680d84..1b65013 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.platform.common.tool.ServletRequestTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -88,6 +89,9 @@ public class WhiteController extends CoreBaseController { @Autowired private ISysConfigService configService; + @Autowired + private ISysMenuService sysMenuService; + @Resource(name=CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @@ -519,11 +523,19 @@ public class WhiteController extends CoreBaseController { } } + @AnnoIgnoreLog @PostMapping(value = "/miss-resource/get") @ApiOperation(value = "缺失资源", notes = "缺失资源") - public ResultBean getMissResourceByKey(String key,String soft){ + public ResultBean getMissResourceByKey(String key,String menuCode){ try { - LocaleUtils.saveMissResource(key, AuthUtil.getSessionLanguage().toString(), CommonEnumUtil.SOFT_TYPE.descOf(soft), + SysMenu sysMenu = sysMenuService.getSysMenuByCode(menuCode); + CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(sysMenu.getSoftType()); + if(softType == null){ + softType = CommonEnumUtil.SOFT_TYPE.IMPP; + } + + LocaleUtils.saveMissResource(key, AuthUtil.getSessionLanguage().toString(), + softType.getValue(), CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(), CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 839fe55..f58cf59 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -182,12 +182,12 @@ public class SystemInitService implements ISystemInitService { } while (pager.hasNext()); for (Map.Entry> entry : webLangMap.entrySet()) { - redisRes.putHashMap(entry.getKey(), entry.getValue()); + redisRes.putHashMap(entry.getKey(), entry.getValue(),-1); } LOGGER.info("【加载WEB资源】WEB-语言 已分类缓存完毕"); for (Map.Entry> entry : webLangSoftMap.entrySet()) { - redisRes.putHashMap(entry.getKey(), entry.getValue()); + redisRes.putHashMap(entry.getKey(), entry.getValue(),-1); } LOGGER.info("【加载WEB资源】WEB-语言-模块 已分类缓存完毕"); @@ -241,7 +241,7 @@ public class SystemInitService implements ISystemInitService { } while (pager.hasNext()); for (Map.Entry> entry : langSoftMap.entrySet()) { - redisRes.putHashMap(entry.getKey(), entry.getValue()); + redisRes.putHashMap(entry.getKey(), entry.getValue(),-1); } LOGGER.info("【加载资源】模块资源 已分类缓存完毕"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index c419cad..1f5f41e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; @@ -11,8 +10,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -24,7 +23,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.List; /** @@ -232,4 +230,11 @@ public class SysMenuService implements ISysMenuService { pager = PagerHelper.getPager(pager, sysMenuRDao.findByHqlWhereCount(packBean)); return new ListPager(sysMenuRDao.findByHqlWherePage(packBean, pager), pager); } + + @Override + public SysMenu getSysMenuByCode(String code) { + return sysMenuRDao.getByProperty( + new String[]{"code", "isDeleted", "isValid"}, + new Object[]{code, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()}); + } } From c2d32ddb9e5b0d7928392618af42486dff00c75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 26 Apr 2020 10:48:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/DemoResourceController.java | 2 +- .../apiservice/controller/DemoTreeAndExceptionController.java | 2 +- .../core/apiservice/controller/DemoUserInfoController.java | 2 +- .../i3plus/core/apiservice/controller/base/AuthController.java | 2 +- .../core/apiservice/controller/base/BaseMessageController.java | 2 +- .../apiservice/controller/busi/SysBarcodeRuleController.java | 2 +- .../apiservice/controller/busi/SysLabelTemplateController.java | 2 +- .../apiservice/controller/busi/SysLogExceptionController.java | 2 +- .../apiservice/controller/busi/SysLogOperateController.java | 2 +- .../apiservice/controller/busi/SysLogSystemController.java | 2 +- .../core/apiservice/controller/busi/SysPositionController.java | 2 +- .../core/apiservice/controller/busi/SysRoleController.java | 2 +- .../core/apiservice/controller/busi/SysToolController.java | 2 +- .../core/apiservice/controller/busi/SysToolTypeController.java | 2 +- .../core/apiservice/controller/busi/SysTreeController.java | 2 +- .../core/apiservice/controller/busi/SysUserController.java | 2 +- .../core/apiservice/serviceimpl/busi/CoreTreeService.java | 2 +- .../apiservice/serviceimpl/busi/SysBarcodeRuleService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysDepartmentService.java | 2 +- .../apiservice/serviceimpl/busi/SysLabelTemplateService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysMenuService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysMessageService.java | 2 +- .../apiservice/serviceimpl/busi/SysOrderNoRuleService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysPositionService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysRoleService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysTaskCycleService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysTaskPlanService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysTaskService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysToolTypeService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysUserInfoService.java | 2 +- .../core/apiservice/serviceimpl/busi/SysUserService.java | 2 +- .../cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/ArraySort.java | 10 +++++----- 33 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 4f0cd58..98221c6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -17,7 +17,7 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.impp.framework.boot.exception.ImppBusiException; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java index a6615db..20700ec 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java @@ -8,7 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java index 1cd4714..4f1b0e3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUserInfoController.java @@ -14,7 +14,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index f3af991..f8131a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.LocaleUtils; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java index 340719c..758c5a3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java @@ -17,7 +17,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java index e5b0f21..9be0444 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java @@ -11,7 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java index 0edca8e..5305baf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java @@ -15,7 +15,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 08100f9..ea9a03e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -17,7 +17,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 91e5fa3..0e31cfd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -18,7 +18,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 6da1bde..0d9b2be 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -16,7 +16,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 0ec9519..919b122 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -17,7 +17,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index a2bd25f..309b7f8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -16,7 +16,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index 80b2f77..d6f0af5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -14,7 +14,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 31252d1..793f6d5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -14,7 +14,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index 1176560..fcde949 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysPosition; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 03ba236..cb817cd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -17,7 +17,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 73b7296..077ef21 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -18,7 +18,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; import cn.estsh.i3plus.pojo.platform.repository.SysOrganizeRepository; import cn.estsh.i3plus.pojo.platform.repository.SysPositionRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java index 9ddbdc2..bc2d760 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java @@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; import cn.estsh.i3plus.pojo.platform.repository.SysBarcodeRuleRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 66b26b2..d423985 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -13,7 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java index fca4fd2..43ac664 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -18,7 +18,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysLabelTemplateRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index 1f5f41e..f203499 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -14,7 +14,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index db4228d..f977032 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -17,7 +17,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java index 0cda5d2..4d5e82e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java @@ -13,7 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.i3plus.pojo.platform.repository.SysOrderNoRuleRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index cd118c4..082e5ec 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -15,7 +15,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 0925154..20106a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -18,7 +18,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java index 963cec2..dfae76b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java @@ -12,7 +12,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysTaskCycleRepository; import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java index 6cee1e2..d16ffcd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java @@ -15,7 +15,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository; import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java index 181178e..8bdb712 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -12,7 +13,6 @@ import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository; import cn.estsh.i3plus.pojo.platform.repository.SysTaskRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java index 4d87927..9ade0fe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java @@ -11,7 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository; import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 6f2e1ae..e352a7c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -15,7 +15,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 9e146dd..52d9246 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -26,7 +26,7 @@ import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.RedisCacheTool; import io.swagger.annotations.ApiOperation; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java index 820698c..7b0dcda 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java @@ -4,7 +4,7 @@ import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; import java.text.MessageFormat; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java index 5d501bb..c8b7546 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java @@ -24,11 +24,11 @@ public class ArraySort implements Runnable { @Override public void run() { - try { - Thread.sleep(Integer.parseInt(num)); +// try { +// Thread.sleep(Integer.parseInt(num)); System.out.println(num); - } catch (InterruptedException e) { - e.printStackTrace(); - } +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } } }