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

yun-zuoyi
yunhao.wang 6 years ago
commit 002e863030

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

@ -120,7 +120,7 @@ public class DemoCloudController {
@ApiOperation(value="测试arr",notes = "测试arr") @ApiOperation(value="测试arr",notes = "测试arr")
public ResultBean testFeignArr(@RequestBody String[] arr) { public ResultBean testFeignArr(@RequestBody String[] arr) {
LOGGER.info("【impp-core-arr接受数据】{}" ,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") @PostMapping(value="/test-more-object")
@ -138,7 +138,6 @@ public class DemoCloudController {
public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) { public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) {
LOGGER.info("PostMapping【param】{}" ,test); LOGGER.info("PostMapping【param】{}" ,test);
Map<String, String> map = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames(); Enumeration headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) { while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement(); String key = (String) headerNames.nextElement();
@ -153,7 +152,6 @@ public class DemoCloudController {
@GetMapping(value="/test-get-request-body") @GetMapping(value="/test-get-request-body")
@ApiOperation(value="测试request-body") @ApiOperation(value="测试request-body")
public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean<SysRole> roleBean) { public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean<SysRole> roleBean) {
Map<String, String> map = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames(); Enumeration headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) { while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement(); String key = (String) headerNames.nextElement();

@ -261,9 +261,9 @@ public class DemoResourceController extends CoreBaseController {
// System.out.println("1====" + u1.hashCode()); // System.out.println("1====" + u1.hashCode());
// System.out.println("2====" + u2.hashCode()); // System.out.println("2====" + u2.hashCode());
SysUser user = userService.getSysUserById(key); // SysUser user = userService.getSysUserById(key);
// System.out.println("1==="+user); // System.out.println("1==="+user);
SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); // SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key);
// System.out.println("2==="+userInfo); // System.out.println("2==="+userInfo);
return ResultBean.success("操作成功"); return ResultBean.success("操作成功");

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

@ -34,7 +34,7 @@ public class TestDaoImpl implements ITestDao {
@Override @Override
public void insertBatch(int num, int waitTime) { public void insertBatch(int num, int waitTime) {
long t1 = System.currentTimeMillis(); long t1 = System.currentTimeMillis();
SysTool sysTool = new SysTool(); SysTool sysTool;
StringBuffer sb = new StringBuffer(); 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 "); 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(); SnowflakeIdMaker snf = new SnowflakeIdMaker();

@ -32,7 +32,7 @@ public class ReportService implements IReportService {
public void checkReportHQL(String hql) { public void checkReportHQL(String hql) {
LOGGER.info("报表 HQL 注入检查:{}",hql); LOGGER.info("报表 HQL 注入检查:{}",hql);
// HQL 非法入侵检查 // HQL 非法入侵检查
hql = HqlPack.getSafeParam(hql); HqlPack.getSafeParam(hql);
} }
@Override @Override

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

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

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

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

@ -218,7 +218,7 @@ public class SysUserInfoService implements ISysUserInfoService {
LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId);
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
if(userInfo != null){ if(userInfo != null){
int count = sysUserRepository.findByPropertyCount( sysUserRepository.findByPropertyCount(
new String[]{"userInfoId","isValid"}, new String[]{"userInfoId","isValid"},
new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()});
// userInfo.setUserNum(count); // userInfo.setUserNum(count);

@ -34,7 +34,6 @@ public class TestMain {
int wId = new Random().nextInt(29) + 1; int wId = new Random().nextInt(29) + 1;
System.out.println("random id -> "+wId); System.out.println("random id -> "+wId);
SnowflakeIdMaker m = new SnowflakeIdMaker(wId,3); SnowflakeIdMaker m = new SnowflakeIdMaker(wId,3);
m = new SnowflakeIdMaker(wId,3);
int i = 0; int i = 0;
long id; long id;

@ -42,7 +42,7 @@ public class TestBase {
SecurityUtils.setSecurityManager(securityManager); SecurityUtils.setSecurityManager(securityManager);
securityManager.start(sessionContext); 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); // SessionUser sessionUser = AuthUtil.login(token);
// AuthUtil.setSessionUser(sessionUser); // AuthUtil.setSessionUser(sessionUser);
System.out.println("----------------->> 开始测试 <<-----------------"); System.out.println("----------------->> 开始测试 <<-----------------");

@ -1,96 +1,96 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; //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.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*; //import cn.estsh.i3plus.pojo.platform.repository.*;
import org.apache.poi.ss.usermodel.Row; //import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFSheet; //import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; //import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.Test; //import org.junit.Test;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
//
import java.io.InputStream; //import java.io.InputStream;
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : yunhao // * @Author : yunhao
* @CreateDate : 2018-11-22 11:01 // * @CreateDate : 2018-11-22 11:01
* @Modify: // * @Modify:
**/ // **/
public class TestExcelOrderNoRule extends TestBase { //public class TestExcelOrderNoRule extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase {
//
public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelOrderNoRule.class); // public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelOrderNoRule.class);
//
// 文件路径 // // 文件路径
public static final String PATH_NAME = "init/oder-no-rule.xlsx"; // public static final String PATH_NAME = "init/oder-no-rule.xlsx";
// 权限Sheet 名称 // // 权限Sheet 名称
public static final String SHEET_ORDER_NO_RULE = "order-no-rule"; // public static final String SHEET_ORDER_NO_RULE = "order-no-rule";
//
@Autowired // @Autowired
private SysOrderNoRuleRepository sysOrderNoRuleRDao; // private SysOrderNoRuleRepository sysOrderNoRuleRDao;
//
@Test // @Test
public void testInit() throws Exception { // public void testInit() throws Exception {
XSSFWorkbook workbook = getWorkbook(PATH_NAME); // XSSFWorkbook workbook = getWorkbook(PATH_NAME);
if(workbook != null){ // if(workbook != null){
XSSFSheet sheetOrderNoRule = workbook.getSheet(SHEET_ORDER_NO_RULE); // XSSFSheet sheetOrderNoRule = workbook.getSheet(SHEET_ORDER_NO_RULE);
//
List<SysOrderNoRule> ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule); // List<SysOrderNoRule> ysOrderNoRuleList = getSysOrderNoRule(sheetOrderNoRule);
//
LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size()); // LOGGER.info("System Init SysOrderNoRule Size:{}",ysOrderNoRuleList.size());
//
sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList); // sysOrderNoRuleRDao.saveAll(ysOrderNoRuleList);
} // }
} // }
//
public List<SysOrderNoRule> getSysOrderNoRule(XSSFSheet sheet){ // public List<SysOrderNoRule> getSysOrderNoRule(XSSFSheet sheet){
List<SysOrderNoRule> result = new ArrayList<>(); // List<SysOrderNoRule> result = new ArrayList<>();
if(sheet != null){ // if(sheet != null){
if(sheet.getLastRowNum() >= 1){ // if(sheet.getLastRowNum() >= 1){
SysOrderNoRule obj = null; // SysOrderNoRule obj = null;
for (int i = 1; i <= sheet.getLastRowNum(); i++) { // for (int i = 1; i <= sheet.getLastRowNum(); i++) {
try { // try {
Row row = sheet.getRow(i);//获取索引为i的行以0开始 // Row row = sheet.getRow(i);//获取索引为i的行以0开始
if(row.getCell(0).toString().trim().length() > 0){ // if(row.getCell(0).toString().trim().length() > 0){
obj = new SysOrderNoRule(); // obj = new SysOrderNoRule();
obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); // obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
obj.setName(row.getCell(1).getStringCellValue()); // obj.setName(row.getCell(1).getStringCellValue());
obj.setOrderNoRuleCode(row.getCell(2).getStringCellValue()); // obj.setOrderNoRuleCode(row.getCell(2).getStringCellValue());
obj.setOrderNoRule(row.getCell(3).getStringCellValue()); // obj.setOrderNoRule(row.getCell(3).getStringCellValue());
obj.setSerialNoSeed(Long.parseLong(row.getCell(4).getStringCellValue())); // obj.setSerialNoSeed(Long.parseLong(row.getCell(4).getStringCellValue()));
obj.setSerialNoIncrement(Long.parseLong(row.getCell(5).getStringCellValue())); // obj.setSerialNoIncrement(Long.parseLong(row.getCell(5).getStringCellValue()));
obj.setSerialNoLength(Long.parseLong(row.getCell(6).getStringCellValue())); // obj.setSerialNoLength(Long.parseLong(row.getCell(6).getStringCellValue()));
obj.setIsCycle(Integer.parseInt(row.getCell(7).getStringCellValue())); // obj.setIsCycle(Integer.parseInt(row.getCell(7).getStringCellValue()));
obj.setOrderNoRuleDescription(row.getCell(8).getStringCellValue()); // obj.setOrderNoRuleDescription(row.getCell(8).getStringCellValue());
obj.setOrderNoRuleStatus(1); // obj.setOrderNoRuleStatus(1);
obj.setSerialNo(-1L); // obj.setSerialNo(-1L);
obj.setIsValid(1); // obj.setIsValid(1);
//
result.add(obj); // result.add(obj);
} // }
}catch (Exception e){ // }catch (Exception e){
LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); // LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
} // }
} // }
} // }
} // }
return result; // return result;
} // }
//
public XSSFWorkbook getWorkbook(String pathName){ // public XSSFWorkbook getWorkbook(String pathName){
try { // try {
InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); // InputStream in = cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
XSSFWorkbook workbook = new XSSFWorkbook(in); // XSSFWorkbook workbook = new XSSFWorkbook(in);
return workbook; // return workbook;
}catch (Exception e){ // }catch (Exception e){
LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); // LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
e.getMessage(); // e.getMessage();
return null; // return null;
} // }
} // }
//
} //}

@ -30,7 +30,6 @@ public class TestMathOper extends cn.estsh.i3plus.core.apiservice.serviceimpl.bu
@Test @Test
public void testMax(){ public void testMax(){
SysConfig sysConfig = new SysConfig();
// max // max
System.out.println(sysConfigRDao.findMaxByProperties(propertyName,groupByName,param,paramValue)); System.out.println(sysConfigRDao.findMaxByProperties(propertyName,groupByName,param,paramValue));
System.out.println(sysConfigRDao.findMaxByProperty(propertyName,groupByName,param[0],paramValue[0])); System.out.println(sysConfigRDao.findMaxByProperty(propertyName,groupByName,param[0],paramValue[0]));

Loading…
Cancel
Save