Skip to content

J
jxyq
提交 2deaf9fb 作者: JQW
操作

功能开发、完善

上级 fe227a50
正在显示 包含 61 行增加 和 32 行删除
service-web/src/main/java/com/zzsn/clb/member/controller/MemSubjectController.java
......@@ -71,7 +71,7 @@ public class MemSubjectController extends JeecgController<MemSubject, IMemSubjec
LambdaQueryWrapper<MemSubject> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MemSubject::getUserId, user.getId());
queryWrapper.select(MemSubject::getSubjectId);
return Result.OK(memSubjectService.list(queryWrapper).stream().map(m -> m.getSubjectId()).collect(Collectors.toList()));
return Result.OK(memSubjectService.list(queryWrapper).stream().map(m -> m.getLabelId()).collect(Collectors.toList()));
}
/**
......
service-web/src/main/java/com/zzsn/clb/member/mapper/xml/SubjectMapper.xml
......@@ -2,10 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zzsn.clb.member.mapper.SubjectMapper">
<select id="getSubjectList" resultType="java.util.Map">
SELECT s.id subjectId,
s.subject_name subjectName,
le.id labelId,
le.`name` labelName
SELECT s.id subjectId,
s.subject_name subjectName,
lb.label_mark as labelMark,
le.id labelId,
le.`name` labelName
FROM `subject` s
INNER JOIN subject_type_map stm ON s.id = stm.subject_id
INNER JOIN subject_model_map smm ON s.id = smm.subject_id
......
service-web/src/main/java/com/zzsn/clb/member/service/impl/SubjectTreeServiceImpl.java
......@@ -44,6 +44,19 @@ public class SubjectTreeServiceImpl extends ServiceImpl<SubjectMapper, Subject>
childMap.put("name", tmpMap.get("labelName"));
chdlist.add(childMap);
}
chdlist = new ArrayList<>();
map = new HashMap<>();
map.put("key", "fmyq");
map.put("name", "负面舆情");
map.put("child", chdlist);
treeList.add(map);
list = subjectMapper.getNegativeLabelList();
for (Map<String, Object> tmpMap : list) {
Map<String, Object> childMap = new HashMap<>();
childMap.put("key", tmpMap.get("labelId"));
childMap.put("name", tmpMap.get("labelName"));
chdlist.add(childMap);
}
return treeList;
}
}
service-web/src/main/java/com/zzsn/clb/test/ImportExcelData.java
......@@ -21,16 +21,10 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
......@@ -49,9 +43,9 @@ public class ImportExcelData {
SubjectMapper subjectMapper;
public void importData() {
String path = "C:\\Users\\EDY\\Documents\\WeChat Files\\wxid_7d7tl0zyfdxb21\\FileStorage\\File\\2023-02\\克虏宝汇总审核后数据.xlsx";
String path = "C:\\Users\\EDY\\Documents\\WeChat Files\\wxid_7d7tl0zyfdxb21\\FileStorage\\File\\2023-02\\克虏宝汇总审核后数据2次修改.xlsx";
try {
impData(1, 10, path, 21);
impData(401, 10, path, 410);
} catch (IOException e) {
e.printStackTrace();
}
......@@ -109,10 +103,10 @@ public class ImportExcelData {
if (row != null) {
List<String> list = new ArrayList<>();
for (int m = 0; m < columnNum; m++) {
String data = ExcelExportUtil.getValue(row.getCell(m)).trim();
String data = ExcelExportUtil.getValue(row.getCell(m));
list.add(data);
}
setEsData(list, subjectList,negativeList);
setEsData(list, subjectList, negativeList);
//dataList.add(list);
}
}
......@@ -124,6 +118,7 @@ public class ImportExcelData {
String labelId = null;
String labelName = null;
String labelMark = null;
String subjectName=null;
private void setEsData(List<String> list, List<Map<String, Object>> subjectList, List<Map<String, Object>> negativeList) throws IOException {
......@@ -137,27 +132,33 @@ public class ImportExcelData {
String origin = null;
String publishDate = null;
if (StringUtils.isNotBlank(list.get(3))) {
subjectData.setTitle(list.get(3));
subjectData.setTitle(list.get(3).trim());
} else {
return;
}
if (StringUtils.isNotBlank(list.get(0))) {
String subjectName = list.get(0);
subjectName = list.get(0).trim();
}
if (StringUtils.isNotBlank(list.get(1))) {
if (!subjectName.equals("负面舆情")) {
try {
subjectId = subjectList.stream().filter(f -> f.get("subjectName").equals(subjectName)).map(m -> m.get("subjectId")).findFirst().get().toString();
} catch (Exception ex) {
log.error("错误：" + subjectName);
log.error("错误：" + ex.getMessage());
return;
}
labelName = list.get(1);
// Map<String, Object> map = subjectList.stream().filter(f -> f.get("labelName").equals(labelName) && f.get("subjectName").equals(subjectName)).findFirst().get();
Map<String, Object> map = subjectList.stream().filter(f -> f.get("labelName").equals(labelName)).findFirst().get();
labelId = map.get("labelId").toString();
labelMark = map.get("labelMark").toString();
labelName = list.get(1).trim();
try {
Map<String, Object> map = subjectList.stream().filter(f -> f.get("labelName").equals(labelName) && f.get("subjectName").equals(subjectName)).findFirst().get();
labelId = map.get("labelId").toString();
labelMark = map.get("labelMark").toString();
} catch (Exception ex) {
log.error(ex.getMessage());
}
} else {
labelName = list.get(1);
Map<String, Object> map = subjectList.stream().filter(f -> f.get("labelName").equals(labelName)).findFirst().get();
labelName = list.get(1).trim();
Map<String, Object> map = negativeList.stream().filter(f -> f.get("labelName").equals(labelName)).findFirst().get();
labelId = map.get("labelId").toString();
labelMark = map.get("labelMark").toString();
}
......@@ -165,23 +166,23 @@ public class ImportExcelData {
subjectData.setSubjectId(subjectId);
if (StringUtils.isNotBlank(list.get(4))) {
subjectData.setSummary(list.get(4));
subjectData.setSummary(list.get(4).trim());
}
if (StringUtils.isNotBlank(list.get(5))) {
subjectData.setContent(list.get(5));
}
if (StringUtils.isNotBlank(list.get(6))) {
subjectData.setAuthor(list.get(6));
subjectData.setAuthor(list.get(6).trim());
}
if (StringUtils.isNotBlank(list.get(7))) {
subjectData.setOrigin(list.get(7));
subjectData.setOrigin(list.get(7).trim());
}
if (StringUtils.isNotBlank(list.get(8))) {
subjectData.setPublishDate(list.get(8));
}
if (StringUtils.isNotBlank(list.get(9))) {
subjectData.setSourceAddress(list.get(9));
subjectData.setSourceAddress(list.get(9).trim());
}
if (StringUtils.isNotBlank(subjectData.getTitle())) {
List<Label> labelListlist = new ArrayList<>();
......@@ -195,9 +196,13 @@ public class ImportExcelData {
subjectData.setLabels(labelListlist);
subjectData.setDeleteFlag(0);
subjectData.setCheckStatus(1);
subjectData.setDeleteFlag(0);
subjectData.setTopNum(0);
subjectData.setSubjectId(subjectId);
subjectData.setFlag("1");
log.info(JSON.toJSONString(subjectData));
IndexRequest request = new IndexRequest("subjectdatabase")
IndexRequest request = new IndexRequest("subjectdatabase1")
.id(id)
.source(JSON.toJSONString(subjectData), XContentType.JSON);
IndexResponse indexResponse = client.index(request, RequestOptions.DEFAULT);
......
service-web/src/main/java/com/zzsn/clb/test/SubjectData.java
......@@ -49,5 +49,6 @@ public class SubjectData {
//置顶
private Integer topNum;
private String type;
private String flag;
private List<Label> labels;
}
service-web/src/main/java/com/zzsn/clb/web/controller/SubjectController.java
......@@ -91,7 +91,7 @@ public class SubjectController {
*/
@AutoLog(value = "根据信息id查询数据")
@ApiOperation(value = "根据信息id查询数据", notes = "根据信息id查询数据")
@GetMapping(value = "/import")
// @GetMapping(value = "/import")
public Result<?> importData() {
//http://114.115.236.206:9988/subject/display/queryById?_t=1676875032&id=21123000014507
importExcelData.importData();
......
service-web/src/main/java/com/zzsn/clb/web/controller/SubjectDataExtController.java
......@@ -55,10 +55,17 @@ public class SubjectDataExtController extends JeecgController<SubjectDataExt, IS
@GetMapping(value = "/queryArticleById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String articleId, HttpServletRequest request) {
SubjectDataExt subjectDataExt = subjectDataExtService.getById(articleId);
if(subjectDataExt==null)
{
subjectDataExt=new SubjectDataExt();
subjectDataExt.setArticleId(articleId);
subjectDataExt.setCollectNum(0);
subjectDataExt.setThumbsUpNum(0);
}
LoginUser user = null;
try {
user = shiroRealm.checkUserTokenIsEffect(request.getHeader("X-Access-Token"));
} catch (AuthenticationException ex) {
} catch (Exception ex) {
}
if (user != null) {
......
service-web/src/main/java/com/zzsn/utils/ExcelExportUtil.java
......@@ -5,6 +5,7 @@ import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.*;
import org.jeecg.common.util.DateUtils;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
......@@ -107,7 +108,8 @@ public class ExcelExportUtil {
}*/
if (cellType == CellType.NUMERIC) {
if(HSSFDateUtil.isCellDateFormatted(xssfCell)){
return TimeUtil.getDateString(xssfCell.getDateCellValue());
return DateUtils.formatDate(xssfCell.getDateCellValue());
}
DecimalFormat df = new DecimalFormat("0");
return df.format(xssfCell.getNumericCellValue());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论