Merge branch 'dev' into test

yun-zuoyi
jenkins 6 years ago
commit cfff526bd9

@ -0,0 +1,23 @@
package cn.estsh.i3plus.core.api.iservice.base;
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
import io.swagger.annotations.ApiOperation;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-03 13:59
* @Modify:
**/
public interface ISynchronizedService {
/**
*
* @param code
* @return
*/
@ApiOperation(value = "根据code查询最新单号规则")
SysOrderNoRule nextOrderNo(String code);
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService;
import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.core.api.iservice.busi.*;
@ -18,7 +19,6 @@ 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.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -74,7 +74,7 @@ public class WhiteController extends CoreBaseController {
private ISysDictionaryService dictionaryService;
@Autowired
private ISysOrderNoRuleService sysOrderNoRuleService;
private ISynchronizedService synchronizedService;
@Autowired
private ISysOrganizeService sysOrganizeService;
@ -306,7 +306,7 @@ public class WhiteController extends CoreBaseController {
try {
ValidatorBean.checkNotNull(code, "code不能为空");
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.doGetSysOrderNoRuleCode(code);
SysOrderNoRule sysOrderNoRule = synchronizedService.nextOrderNo(code);
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
@ -53,6 +54,9 @@ public class SysOrderNoRuleController extends CoreBaseController {
private ISysOrderNoRuleService sysOrderNoRuleService;
@Autowired
private ISynchronizedService synchronizedService;
@Autowired
private ISysConfigService sysConfigService;
@Autowired
@ -382,11 +386,11 @@ public class SysOrderNoRuleController extends CoreBaseController {
*/
@GetMapping(value = "/get-order-no/{code}")
@ApiOperation(value = "根据单号规则代码,生成单号")
public synchronized ResultBean<SysOrderNoRule> getOrderNo(@PathVariable("code") String code) {
public ResultBean<SysOrderNoRule> getOrderNo(@PathVariable("code") String code) {
try {
ValidatorBean.checkNotNull(code, "code不能为空");
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.doGetSysOrderNoRuleCode(code);
SysOrderNoRule sysOrderNoRule = synchronizedService.nextOrderNo(code);
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -403,14 +407,14 @@ public class SysOrderNoRuleController extends CoreBaseController {
*/
@GetMapping(value = "/get-order-no/{code}/{num}")
@ApiOperation(value = "根据单号规则代码,生成单号")
public synchronized ResultBean<String> getOrderNo(@PathVariable("code") String code,@PathVariable("num") Integer num) {
public ResultBean<String> getOrderNo(@PathVariable("code") String code,@PathVariable("num") Integer num) {
try {
ValidatorBean.checkNotNull(code, "code不能为空");
ValidatorBean.checkNotZero(num,"次数不能为零");
List<String> orderNoList = new ArrayList<>();
for (int i = 0; i < num; i++) {
orderNoList.add(sysOrderNoRuleService.doGetSysOrderNoRuleCode(code).getOrderNo());
orderNoList.add(synchronizedService.nextOrderNo(code).getOrderNo());
}
return ResultBean.success("操作成功").setResultList(orderNoList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {

@ -0,0 +1,26 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-03 14:00
* @Modify:
**/
@Service
public class SynchronizedService implements ISynchronizedService {
@Autowired
private ISysOrderNoRuleService sysOrderNoRuleService;
@Override
public synchronized SysOrderNoRule nextOrderNo(String code) {
return sysOrderNoRuleService.doGetSysOrderNoRuleCode(code);
}
}

@ -140,7 +140,7 @@ public class SystemInitService implements ISystemInitService {
for (String key : resMap.keySet()) {
//放入缓存
if(webLangMap.get(key) != null) {
if(resMap.get(key) != null) {
redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, resMap.get(key), 0);
}
}

@ -0,0 +1,164 @@
package cn.estsh.i3plus.core.apiservice.util;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.*;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-12 20:02
* @Modify:
**/
public class ResourceImportUtil {
public static void main(String[] args) {
File file = new File("C:\\Users\\yunha\\Desktop\\副本资源文件.xlsx");
File sql = new File("C:\\Users\\yunha\\Desktop\\imppRource.sql");
int i = 1;
try {
FileWriter fileWritter = new FileWriter(sql,false);
BufferedWriter bufferWritter = new BufferedWriter(fileWritter);
SnowflakeIdMaker snowflakeIdMaker = new SnowflakeIdMaker();
Workbook wb = new XSSFWorkbook(file);
// 前端资源
Sheet webSheet = wb.getSheet("前端");
Row row =null;
SysLocaleResource sysLocaleResource = new SysLocaleResource();
for (; i < webSheet.getLastRowNum(); i++) {
row = webSheet.getRow(i);
if(row == null|| row.getCell(2) == null|| row.getCell(3) == null){
continue;
}
System.out.println(snowflakeIdMaker.nextId()+"行:"+i);
row.getCell(2).setCellType(CellType.STRING);
row.getCell(3).setCellType(CellType.STRING);
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("CN/zh");
sysLocaleResource.setLanguageNameRdd("简体中文");
sysLocaleResource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.WEB.getValue());
sysLocaleResource.setResourceKey(row.getCell(2).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(2).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("US/en");
sysLocaleResource.setLanguageNameRdd("English");
sysLocaleResource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.WEB.getValue());
sysLocaleResource.setResourceKey(row.getCell(2).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
}
// IMPP 资源
Sheet imppSheet = wb.getSheet("IMPP");
i =0;
for (; i < imppSheet.getLastRowNum(); i++) {
row = imppSheet.getRow(i);
// if(row == null|| row.getCell(2) == null|| row.getCell(3) == null){
// continue;
// }
System.out.println(snowflakeIdMaker.nextId()+" IMPP 行:"+i);
row.getCell(2).setCellType(CellType.STRING);
row.getCell(3).setCellType(CellType.STRING);
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("CN/zh");
sysLocaleResource.setLanguageNameRdd("简体中文");
sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue()));
sysLocaleResource.setResourceKey(row.getCell(3).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("US/en");
sysLocaleResource.setLanguageNameRdd("English");
sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue()));
sysLocaleResource.setResourceKey(row.getCell(3).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(4).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
}
// WMS资源
Sheet wmsSheet = wb.getSheet("WMS");
i =0;
for (; i < wmsSheet.getLastRowNum(); i++) {
row = wmsSheet.getRow(i);
System.out.println(snowflakeIdMaker.nextId()+" WMS 行:"+i);
row.getCell(2).setCellType(CellType.STRING);
row.getCell(3).setCellType(CellType.STRING);
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("CN/zh");
sysLocaleResource.setLanguageNameRdd("简体中文");
sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue()));
sysLocaleResource.setResourceKey(row.getCell(3).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
sysLocaleResource.setId(snowflakeIdMaker.nextId());
sysLocaleResource.setLanguageCode("US/en");
sysLocaleResource.setLanguageNameRdd("English");
sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue()));
sysLocaleResource.setResourceKey(row.getCell(3).getStringCellValue());
sysLocaleResource.setResourceValue(row.getCell(4).getStringCellValue());
System.out.println(sql(sysLocaleResource));
bufferWritter.write(sql(sysLocaleResource));
}
bufferWritter.flush();
bufferWritter.close();
System.out.println("Done");
} catch (IOException e) {
System.out.println(i);
e.printStackTrace();
} catch (InvalidFormatException e) {
System.out.println(i);
e.printStackTrace();
}
}
static int getType(String name){
if("错误提示".equals(name.trim())){
return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION_SOLUTION.getValue();
}else {
return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION_DETAIL.getValue();
}
}
private static String sql(SysLocaleResource sysLocaleResource){
return "insert into sys_locale_resource " +
"(id,is_valid,is_deleted,create_user,create_date_time,modify_user,modify_date_time,resource_type,language_code," +
"language_name_rdd,resource_key,resource_value,is_system) " +
"values " +
"("+sysLocaleResource.getId()+",1,2,\"system\",\"" + TimeTool.getNowTime(true)+"\",\"system\",\"" + TimeTool.getNowTime(true)+
"\","+sysLocaleResource.getResourceType()+",\""+sysLocaleResource.getLanguageCode()+"\",\""+sysLocaleResource.getLanguageNameRdd()+"\",\""
+sysLocaleResource.getResourceKey().replaceAll("\"","\\\\\\\"")+"\",\""+sysLocaleResource.getResourceValue().replaceAll("\"","\\\\\\\"")+"\",1);\n";
}
}
Loading…
Cancel
Save