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 4029f08..c8c1bf9 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 @@ -81,7 +81,6 @@ public class DemoAuthController extends CoreBaseController { try { SessionUser sUser = AuthUtil.getSessionUser(); LOGGER.info("用户：{}",sUser); - Map map = new HashMap(); Enumeration headerNames = request.getHeaderNames(); while (headerNames.hasMoreElements()) { String key = (String) headerNames.nextElement(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index 971b16c..407c96a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java @@ -138,7 +138,6 @@ public class DemoCloudController { public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean roleBean) { LOGGER.info("PostMapping【param】{}" ,test); - Map map = new HashMap(); Enumeration headerNames = request.getHeaderNames(); while (headerNames.hasMoreElements()) { String key = (String) headerNames.nextElement(); @@ -153,7 +152,6 @@ public class DemoCloudController { @GetMapping(value="/test-get-request-body") @ApiOperation(value="测试request-body") public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean roleBean) { - Map map = new HashMap(); Enumeration headerNames = request.getHeaderNames(); while (headerNames.hasMoreElements()) { String key = (String) headerNames.nextElement(); 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 8ff7b99..2d56a8b 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 @@ -261,9 +261,9 @@ public class DemoResourceController extends CoreBaseController { // System.out.println("1====" + u1.hashCode()); // System.out.println("2====" + u2.hashCode()); - SysUser user = userService.getSysUserById(key); +// SysUser user = userService.getSysUserById(key); // System.out.println("1==="+user); - SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); +// SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); // System.out.println("2==="+userInfo); return ResultBean.success("操作成功"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/TestDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/TestDaoImpl.java index 4e0896e..8e3c109 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/TestDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/TestDaoImpl.java @@ -34,7 +34,7 @@ public class TestDaoImpl implements ITestDao { @Override public void insertBatch(int num, int waitTime) { long t1 = System.currentTimeMillis(); - SysTool sysTool = new SysTool(); + SysTool sysTool; StringBuffer sb = new StringBuffer(); sb.append("insert into sys_tool (id,name,tool_type_name_rdd,tool_type_id,tool_ip,tool_port,tool_description) values "); SnowflakeIdMaker snf = new SnowflakeIdMaker(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java index 7d1a666..097028b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java @@ -32,7 +32,7 @@ public class ReportService implements IReportService { public void checkReportHQL(String hql) { LOGGER.info("报表 HQL 注入检查:{}",hql); // HQL 非法入侵检查 - hql = HqlPack.getSafeParam(hql); + HqlPack.getSafeParam(hql); } @Override 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 1f36122..9ac550e 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 @@ -218,7 +218,7 @@ public class SysUserInfoService implements ISysUserInfoService { LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null){ - int count = sysUserRepository.findByPropertyCount( + sysUserRepository.findByPropertyCount( new String[]{"userInfoId","isValid"}, new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); // userInfo.setUserNum(count); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java index 17a8767..50a686e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java @@ -34,7 +34,6 @@ public class TestMain { int wId = new Random().nextInt(29) + 1; System.out.println("random id -> "+wId); SnowflakeIdMaker m = new SnowflakeIdMaker(wId,3); - m = new SnowflakeIdMaker(wId,3); int i = 0; long id; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index d806e8f..b2a3860 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -42,7 +42,7 @@ public class TestBase { SecurityUtils.setSecurityManager(securityManager); securityManager.start(sessionContext); - UserToken token = new UserToken("login_name", "login_pwd", "zh"); +// UserToken token = new UserToken("login_name", "login_pwd", "zh"); // SessionUser sessionUser = AuthUtil.login(token); // AuthUtil.setSessionUser(sessionUser); System.out.println("----------------->> 开始测试 <<-----------------"); diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java index 2d527bf..9b634c2 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java @@ -1,96 +1,96 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; - -import cn.estsh.i3plus.pojo.platform.bean.*; -import cn.estsh.i3plus.pojo.platform.repository.*; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-11-22 11:01 - * @Modify: - **/ -public class TestExcelOrderNoRule extends TestBase { - - public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelOrderNoRule.class); - - // 文件路径 - public static final String PATH_NAME = "init/oder-no-rule.xlsx"; - // 权限Sheet 名称 - public static final String SHEET_ORDER_NO_RULE = "order-no-rule"; - - @Autowired - private SysOrderNoRuleRepository sysOrderNoRuleRDao; - - @Test - public void testInit() throws Exception { - XSSFWorkbook workbook = getWorkbook(PATH_NAME); - if(workbook != null){ - XSSFSheet sheetOrderNoRule = workbook.getSheet(SHEET_ORDER_NO_RULE); - - List ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule); - - LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size()); - - sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList); - } - } - - public List getSysOrderNoRule(XSSFSheet sheet){ - List result = new ArrayList<>(); - if(sheet != null){ - if(sheet.getLastRowNum() >= 1){ - SysOrderNoRule obj = null; - for (int i = 1; i <= sheet.getLastRowNum(); i++) { - try { - Row row = sheet.getRow(i);//获取索引为i的行，以0开始 - if(row.getCell(0).toString().trim().length() > 0){ - obj = new SysOrderNoRule(); - obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); - obj.setName(row.getCell(1).getStringCellValue()); - obj.setOrderNoRuleCode(row.getCell(2).getStringCellValue()); - obj.setOrderNoRule(row.getCell(3).getStringCellValue()); - obj.setSerialNoSeed(Long.parseLong(row.getCell(4).getStringCellValue())); - obj.setSerialNoIncrement(Long.parseLong(row.getCell(5).getStringCellValue())); - obj.setSerialNoLength(Long.parseLong(row.getCell(6).getStringCellValue())); - obj.setIsCycle(Integer.parseInt(row.getCell(7).getStringCellValue())); - obj.setOrderNoRuleDescription(row.getCell(8).getStringCellValue()); - obj.setOrderNoRuleStatus(1); - obj.setSerialNo(-1L); - obj.setIsValid(1); - - result.add(obj); - } - }catch (Exception e){ - LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); - } - } - } - } - return result; - } - - public XSSFWorkbook getWorkbook(String pathName){ - try { - InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); - XSSFWorkbook workbook = new XSSFWorkbook(in); - return workbook; - }catch (Exception e){ - LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); - e.getMessage(); - return null; - } - } - -} +//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +// +//import cn.estsh.i3plus.pojo.platform.bean.*; +//import cn.estsh.i3plus.pojo.platform.repository.*; +//import org.apache.poi.ss.usermodel.Row; +//import org.apache.poi.xssf.usermodel.XSSFSheet; +//import org.apache.poi.xssf.usermodel.XSSFWorkbook; +//import org.junit.Test; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import java.io.InputStream; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * @Description : +// * @Reference : +// * @Author : yunhao +// * @CreateDate : 2018-11-22 11:01 +// * @Modify: +// **/ +//public class TestExcelOrderNoRule extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase { +// +// public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelOrderNoRule.class); +// +// // 文件路径 +// public static final String PATH_NAME = "init/oder-no-rule.xlsx"; +// // 权限Sheet 名称 +// public static final String SHEET_ORDER_NO_RULE = "order-no-rule"; +// +// @Autowired +// private SysOrderNoRuleRepository sysOrderNoRuleRDao; +// +// @Test +// public void testInit() throws Exception { +// XSSFWorkbook workbook = getWorkbook(PATH_NAME); +// if(workbook != null){ +// XSSFSheet sheetOrderNoRule = workbook.getSheet(SHEET_ORDER_NO_RULE); +// +// List ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule); +// +// LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size()); +// +// sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList); +// } +// } +// +// public List getSysOrderNoRule(XSSFSheet sheet){ +// List result = new ArrayList<>(); +// if(sheet != null){ +// if(sheet.getLastRowNum() >= 1){ +// SysOrderNoRule obj = null; +// for (int i = 1; i <= sheet.getLastRowNum(); i++) { +// try { +// Row row = sheet.getRow(i);//获取索引为i的行，以0开始 +// if(row.getCell(0).toString().trim().length() > 0){ +// obj = new SysOrderNoRule(); +// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); +// obj.setName(row.getCell(1).getStringCellValue()); +// obj.setOrderNoRuleCode(row.getCell(2).getStringCellValue()); +// obj.setOrderNoRule(row.getCell(3).getStringCellValue()); +// obj.setSerialNoSeed(Long.parseLong(row.getCell(4).getStringCellValue())); +// obj.setSerialNoIncrement(Long.parseLong(row.getCell(5).getStringCellValue())); +// obj.setSerialNoLength(Long.parseLong(row.getCell(6).getStringCellValue())); +// obj.setIsCycle(Integer.parseInt(row.getCell(7).getStringCellValue())); +// obj.setOrderNoRuleDescription(row.getCell(8).getStringCellValue()); +// obj.setOrderNoRuleStatus(1); +// obj.setSerialNo(-1L); +// obj.setIsValid(1); +// +// result.add(obj); +// } +// }catch (Exception e){ +// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); +// } +// } +// } +// } +// return result; +// } +// +// public XSSFWorkbook getWorkbook(String pathName){ +// try { +// InputStream in = cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); +// XSSFWorkbook workbook = new XSSFWorkbook(in); +// return workbook; +// }catch (Exception e){ +// LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); +// e.getMessage(); +// return null; +// } +// } +// +//} diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java index 3770b78..9a70876 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java @@ -30,7 +30,6 @@ public class TestMathOper extends cn.estsh.i3plus.core.apiservice.serviceimpl.bu @Test public void testMax(){ - SysConfig sysConfig = new SysConfig(); // max System.out.println(sysConfigRDao.findMaxByProperties(propertyName,groupByName,param,paramValue)); System.out.println(sysConfigRDao.findMaxByProperty(propertyName,groupByName,param[0],paramValue[0]));