elink-star
/
epdc-cloud-events-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
YUJT 4 years ago
parent
6724a592da
commit
eaf08d7077
2 changed files with 14 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epdc-cloud-events/pom.xml
  2. 36
      epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

10
epdc-cloud-events/pom.xml
View File

@ -235,10 +235,10 @@
<spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
<spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.ip>47.104.85.99</nacos.ip>
<nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
<nacos.ip></nacos.ip>
<nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
<!--党群e家小程序配置-->
<wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
@ -250,7 +250,7 @@
<analysis.wx.ma.appId>wxb61fe7aced26ba7b</analysis.wx.ma.appId>
<analysis.wx.ma.secret>373c305e69b78f4d575d355fddb05146</analysis.wx.ma.secret>
<!--RocketMQ-->
<rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
<rocketmq.name.server>115.29.142.202:9876</rocketmq.name.server>
<rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
<rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
<rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>

36
epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
import com.elink.esua.epdc.dto.category.CategoryDTO;
@ -334,14 +335,14 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
if (null != cell) {
if (c == 0) {
//领域列编号
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !firstClassInfoCode.equals(value)){
firstClassInfoCode = value;
}
}else if (c == 1) {
//领域列
firstClassNameCurrent = "";
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !firstClassName.equals(value)){
firstClassName = value;
firstClassNameCurrent = value;
@ -357,14 +358,14 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
}
}else if (c == 2) {
//大类列编号
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !secondClassInfoCode.equals(value)){
secondClassInfoCode = value;
}
}else if (c == 3) {
//大类列
secondClassNameCurrent = "";
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !secondClassName.equals(value)){
secondClassName = value;
secondClassNameCurrent = value;
@ -377,14 +378,14 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
}
} else if (c == 4) {
//小类列编号
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !thirdClassInfoCode.equals(value)){
thirdClassInfoCode = value;
}
}else if (c == 5) {
//小类列
thirdClassNameCurrent = "";
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !thirdClassName.equals(value)){
thirdClassName = value;
thirdClassNameCurrent = value;
@ -395,14 +396,14 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
}
}else if (c == 6) {
//细类名称列编号
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !fourthClassInfoCode.equals(value)){
fourthClassInfoCode = value;
}
} else if (c == 7) {
//细类名称列
fourthClassNameCurrent = "";
String value = getCellContent(cell);
String value = ExcelUtils.getCellContent(cell);
if(!"".equals(value) && !fourthClassName.equals(value)){
fourthClassName = value;
fourthClassNameCurrent = value;
@ -459,25 +460,6 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
return result;
}
/**
* 获取单元格内容
* @param cell
* @return
*/
public String getCellContent(Cell cell){
String value = "";
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
value = String.valueOf(cell.getNumericCellValue());
} else {
value = cell.getStringCellValue();
}
//内容超过25个字进行长度限制，否则数据库会超限
/*if(value.length() > 25){
value = value.substring(0,25) + "...";
}*/
return value;
}
/**
* 获取19位随机数
* @return

Write Preview
Loading…
Cancel
Save