I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
yunhao.wang 6 years ago
parent 2d81c898d8 ace9524733
commit 002e863030
15 changed files with 108 additions and 114 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java
Unescape Escape View File

@ -81,7 +81,6 @@ public class DemoAuthController extends CoreBaseController {
try {
SessionUser sUser = AuthUtil.getSessionUser();
LOGGER.info("用户：{}",sUser);
Map<String, String> map = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
Unescape Escape View File

@ -120,7 +120,7 @@ public class DemoCloudController {
@ApiOperation(value="测试arr",notes = "测试arr")
public ResultBean testFeignArr(@RequestBody String[] arr) {
LOGGER.info("【impp-core-arr接受数据】{}" ,arr);
return ResultBean.success("返回：" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("返回成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(arr);
}
@PostMapping(value="/test-more-object")
@ -138,7 +138,6 @@ public class DemoCloudController {
public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) {
LOGGER.info("PostMapping【param】{}" ,test);
Map<String, String> map = new HashMap<String, String>();
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<SysRole> roleBean) {
Map<String, String> map = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java
Unescape Escape View File

@ -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("操作成功");

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
Unescape Escape View File

@ -164,8 +164,7 @@ public class SysUserInfoController extends CoreBaseController{
ValidatorBean.checkIsNumber(id, "id 不能为空");
SysUserInfo userInfo = sysUserInfoService.getSysUserInfoById(Long.parseLong(id));
ValidatorBean.beginValid(userInfo)
.notNull("id",userInfo.getId());
ValidatorBean.beginValid(userInfo).notNull("id",userInfo.getId());
if(userInfo != null){
return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/TestDaoImpl.java
Unescape Escape View File

@ -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();

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java
Unescape Escape View File

@ -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

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java
Unescape Escape View File

@ -166,7 +166,7 @@ public class SysDictionaryService implements ISysDictionaryService {
.build();
}
LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString());
LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids);
sysDictionaryRDao.deleteByIds(ids);
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java
Unescape Escape View File

@ -96,7 +96,7 @@ public class SysFileServiceImpl implements ISysFileService {
@Override
public void deleteSysFileByIds(Long[] ids) {
LOGGER.info("文件资源 SYS_FILE ids:{}", ids.toString());
LOGGER.info("文件资源 SYS_FILE ids:{}", ids);
sysFileRDao.deleteByIds(ids);
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class SysMessageService implements ISysMessageService {
@Override
@ApiOperation(value = "批量删除消息")
public void deleteSysMessageByIds(Long[] ids) {
LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString());
LOGGER.info("消息 SYS_MESSAGE ids:{}", ids);
sysMessageRDao.deleteByIds(ids);
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java
Unescape Escape View File

@ -102,7 +102,7 @@ public class SysToolTypeService implements ISysToolTypeService {
@Override
@ApiOperation(value = "删除硬件类型",notes = "根据 ID 批量删除硬件类型信息")
public void deleteSysToolTypeByIds(Long[] ids) {
LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString());
LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids);
List<SysTool> count = toolRDao.findByHqlWhere(CoreHqlPack.packHqlIds("toolTypeId",ids));
if(count.size() > 0){
throw ImppExceptionBuilder.newInstance()

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
Unescape Escape View File

@ -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);

1
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java
Unescape Escape View File

@ -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;

2
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java
Unescape Escape View File

@ -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("----------------->> 开始测试 <<-----------------");

192
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelOrderNoRule.java
Unescape Escape View File

@ -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<SysOrderNoRule> ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule);
LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size());
sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList);
}
}
public List<SysOrderNoRule> getSysOrderNoRule(XSSFSheet sheet){
List<SysOrderNoRule> 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<SysOrderNoRule> ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule);
//
// LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size());
//
// sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList);
// }
// }
//
// public List<SysOrderNoRule> getSysOrderNoRule(XSSFSheet sheet){
// List<SysOrderNoRule> 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;
// }
// }
//
//}

1
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java
Unescape Escape View File

@ -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]));

Write Preview
Loading…
Cancel
Save