Merge remote-tracking branch 'origin/develop_master' into develop_3
This commit is contained in:
zhaokaiyao@91isoft.com
@@ -30,6 +30,7 @@ public class ConvertHtml2Excel {
|
||||
List<CrossRangeCellMeta> crossRowEleMetaLs = new ArrayList<CrossRangeCellMeta>();
|
||||
int rowIndex = 0;
|
||||
try {
|
||||
tableHtml=tableHtml.replaceAll("\''","\'");
|
||||
Document data = DocumentHelper.parseText(tableHtml);
|
||||
HSSFCellStyle contentStyle = getContentStyle(wb);
|
||||
// 生成表头
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.common;
|
||||
|
||||
import com.adc.da.common.WDWUtil;
|
||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.commons.CommonsMultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
/**
|
||||
* @des : excel信息读取
|
||||
* @author: duyunbao
|
||||
* @email: 1114808306@qq.com
|
||||
* @date 2017/10/27 17:06
|
||||
**/
|
||||
public class ReadExcel {
|
||||
private static final Logger logger = LoggerFactory.getLogger(ReadExcel.class);
|
||||
|
||||
/**
|
||||
* 总行数
|
||||
*/
|
||||
private int totalRows = 0;
|
||||
/**
|
||||
* 总条数
|
||||
*/
|
||||
private int totalCells = 0;
|
||||
/**
|
||||
* 错误信息接收器
|
||||
*/
|
||||
private String errorMsg;
|
||||
|
||||
public ReadExcel() {
|
||||
// 不做操作
|
||||
}
|
||||
|
||||
public int getTotalRows() {
|
||||
return totalRows;
|
||||
}
|
||||
|
||||
public int getTotalCells() {
|
||||
return totalCells;
|
||||
}
|
||||
|
||||
public String getErrorInfo() {//获取错误信息
|
||||
return errorMsg;
|
||||
}
|
||||
|
||||
/**
|
||||
* @method_name: validateExcel
|
||||
* @des : 验证excel格式
|
||||
* @author: duyunbao
|
||||
* @param: [filePath]
|
||||
* @return: boolean
|
||||
* @date: 2017/10/27 17:07
|
||||
**/
|
||||
public boolean validateExcel(String filePath) {
|
||||
if (filePath == null || !(WDWUtil.isExcel2003(filePath) || WDWUtil.isExcel2007(filePath))) {
|
||||
errorMsg = "文件名不是excel格式";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @method_name: getExcelInfo
|
||||
* @des : 读EXCEL文件，获取信息集合
|
||||
* @author: duyunbao
|
||||
* @param: [fileName, Mfile]
|
||||
* @return: org.apache.poi.ss.usermodel.Workbook
|
||||
* @date: 2017/10/27 17:08
|
||||
**/
|
||||
public Workbook getExcelInfo(String fileName, MultipartFile Mfile) {
|
||||
Workbook wb = null;
|
||||
//把spring文件上传的MultipartFile转换成CommonsMultipartFile类型
|
||||
CommonsMultipartFile cf = (CommonsMultipartFile) Mfile; //获取本地存储路径
|
||||
//初始化输入流
|
||||
InputStream is = null;
|
||||
try {
|
||||
//根据文件名判断文件是2003版本还是2007版本
|
||||
boolean isExcel2003 = true;
|
||||
if (WDWUtil.isExcel2007(fileName)) {
|
||||
isExcel2003 = false;
|
||||
}
|
||||
is = cf.getInputStream();
|
||||
//根据excel里面的内容读取客户信息
|
||||
wb = getExcelInfo(is, isExcel2003, wb);
|
||||
is.close();
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getMessage(),e);
|
||||
} finally {
|
||||
if (is != null) {
|
||||
try {
|
||||
is.close();
|
||||
} catch (IOException e) {
|
||||
is = null;
|
||||
logger.error(e.getMessage(),e);
|
||||
}
|
||||
}
|
||||
}
|
||||
return wb;
|
||||
}
|
||||
|
||||
/***
|
||||
* @method_name: getExcelInfo
|
||||
* @des : 判断excel版本
|
||||
* @author: duyunbao
|
||||
* @param: [is, isExcel2003, wb]
|
||||
* @return: org.apache.poi.ss.usermodel.Workbook
|
||||
* @date: 2017/10/27 17:08
|
||||
**/
|
||||
private Workbook getExcelInfo(InputStream is, boolean isExcel2003, Workbook wb) {
|
||||
Workbook workbook =wb;
|
||||
try {
|
||||
/** 根据版本选择创建Workbook的方式 */
|
||||
//当excel是2003时
|
||||
if (isExcel2003) {
|
||||
workbook = new HSSFWorkbook(is);
|
||||
} else {//当excel是2007时
|
||||
workbook = new XSSFWorkbook(is);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
logger.error(e.getMessage(),e);
|
||||
}
|
||||
return workbook;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取sheet的名称
|
||||
* @MethodName:getSheetName
|
||||
* @author: 马晓晨
|
||||
* @email: 747052172@qq.com
|
||||
* @date 2017年11月24日 上午9:49:22
|
||||
* @version V1.0
|
||||
* @param filename
|
||||
* @param file
|
||||
* @param sheetIndex
|
||||
* @return
|
||||
*/
|
||||
public String getSheetName(String filename, MultipartFile file, Integer sheetIndex) {
|
||||
Workbook wb = getExcelInfo(filename, file);
|
||||
return wb.getSheetName(sheetIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @Title: encodeFileName
|
||||
* @Description: 导出文件转换文件名称编码
|
||||
* @param @param fileNames
|
||||
* @param @param request
|
||||
* @param @return 设定文件
|
||||
* @return String 返回类型
|
||||
* @throws
|
||||
*/
|
||||
public static String encodeFileName(String fileNames ,HttpServletRequest request) {
|
||||
try {
|
||||
String agent = request.getHeader("User-Agent");
|
||||
if (agent.contains("Firefox")) {
|
||||
fileNames = new String(fileNames.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器
|
||||
} else {
|
||||
fileNames = URLEncoder.encode(fileNames, "utf-8");
|
||||
//谷歌中空格变为+问题
|
||||
fileNames = fileNames.replaceAll("\\+","%20");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error(e.getMessage(),e);
|
||||
}
|
||||
return fileNames ;
|
||||
}
|
||||
}
|
||||
+355
@@ -0,0 +1,355 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.controller;
|
||||
|
||||
import com.adc.da.att.entity.AttFileEO;
|
||||
import com.adc.da.att.service.IAttFileEOService;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.excel.poi.excel.ExcelExportUtil;
|
||||
import com.adc.da.excel.poi.excel.entity.ExportParams;
|
||||
import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
|
||||
import com.adc.da.http.PageInfo;
|
||||
import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
|
||||
import com.adc.da.slrs.msgDynamicInfo.dto.MsgDynamicInfoExportDto;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgDynamicInfoEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgDynamicInfoEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgFileEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.service.IMsgDynamicInfoEOService;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.service.IMsgFileEOService;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.MsgDynamicInfoVO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.RecommendVO;
|
||||
import com.adc.da.login.util.UserUtils;
|
||||
import com.adc.da.person.service.IPersonCollectEOService;
|
||||
import com.adc.da.sys.constant.ValidFlagEnum;
|
||||
import com.adc.da.sys.service.IUserEOService;
|
||||
import com.adc.da.util.exception.AdcDaBaseException;
|
||||
import com.adc.da.util.http.ResponseMessage;
|
||||
import com.adc.da.util.http.ResponseMessageCodeEnum;
|
||||
import com.adc.da.util.http.Result;
|
||||
import com.adc.da.util.utils.BeanMapper;
|
||||
import com.adc.da.util.utils.StringUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.poi.util.IOUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Wrapper;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/${restPath}/lawss/msgDynamicInfo")
|
||||
@Api(description = "|MsgDynamicInfoEO|")
|
||||
public class MsgDynamicInfoEOController extends BaseController<MsgDynamicInfoEO>{
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(MsgDynamicInfoEOController.class);
|
||||
|
||||
@Autowired
|
||||
private IMsgDynamicInfoEOService msgDynamicInfoEOService;
|
||||
|
||||
@Autowired
|
||||
private IUserEOService userEOService;
|
||||
|
||||
@Autowired
|
||||
BeanMapper beanMapper;
|
||||
|
||||
@Autowired
|
||||
private IMsgFileEOService msgFileEOService;
|
||||
|
||||
@Autowired
|
||||
private IPersonCollectEOService personCollectEOService;
|
||||
|
||||
@Autowired
|
||||
private IAttFileEOService attFileEOService;
|
||||
|
||||
/**
|
||||
* @Author liwenxuan
|
||||
* @Description 分页查询动态信息表信息
|
||||
* @Date Administrator 2018/9/17
|
||||
* @Param [pageNo, pageSize]
|
||||
* @return com.adc.da.util.http.ResponseMessage<com.adc.da.util.http.PageInfo<com.adc.da.lawss.entity.MsgDynamicInfoEO>>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|分页查询")
|
||||
@GetMapping("/page")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:page")
|
||||
public ResponseMessage<PageInfo<MsgDynamicInfoEO>> page(MsgDynamicInfoEOPage page) throws Exception {
|
||||
if(StringUtils.isNotEmpty(page.getTitle())){
|
||||
page.setTitle("%"+page.getTitle()+"%");
|
||||
page.setTitleOperator("LIKE");
|
||||
}
|
||||
// page.getPager().setOrderDirection(false);
|
||||
// page.getPager().setOrderField("MSG_DYNAMIC_INFO.pub_time");
|
||||
page.setOrderBy("MSG_DYNAMIC_INFO.pub_time desc,MSG_DYNAMIC_INFO.id");
|
||||
List<MsgDynamicInfoEO> rows = msgDynamicInfoEOService.queryByPage(page);
|
||||
return Result.success(getPageInfo(page.getPager(), rows));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|动态信息管理分页查询")
|
||||
@GetMapping("/queryAllByPage")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:page")
|
||||
public ResponseMessage<PageInfo<MsgDynamicInfoEO>> queryByPage(MsgDynamicInfoEOPage page) throws Exception {
|
||||
if(StringUtils.isNotEmpty(page.getTitle())){
|
||||
page.setTitle("%"+page.getTitle()+"%");
|
||||
page.setTitleOperator("LIKE");
|
||||
}
|
||||
// page.getPager().setOrderDirection(false);
|
||||
// page.getPager().setOrderField("MSG_DYNAMIC_INFO.pub_time");
|
||||
page.setOrderBy("MSG_DYNAMIC_INFO.pub_time desc,MSG_DYNAMIC_INFO.id");
|
||||
List<MsgDynamicInfoEO> rows = msgDynamicInfoEOService.queryAllByPage(page);
|
||||
return Result.success(getPageInfo(page.getPager(), rows));
|
||||
}
|
||||
/**
|
||||
* @Author liwenxuan
|
||||
* @Description
|
||||
* @Date Administrator 2018/9/17
|
||||
* @Param [page]
|
||||
* @return com.adc.da.util.http.ResponseMessage<java.util.List<com.adc.da.lawss.entity.MsgDynamicInfoEO>>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|查询")
|
||||
@GetMapping("")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:list")
|
||||
public ResponseMessage<List<MsgDynamicInfoEO>> list(MsgDynamicInfoEOPage page) throws Exception {
|
||||
return Result.success(msgDynamicInfoEOService.queryByList(page));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|详情")
|
||||
@GetMapping("/{id}")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:get")
|
||||
public ResponseMessage<MsgDynamicInfoVO> find(@PathVariable String id) throws Exception {
|
||||
// 此处需要增加查询相关参数信息ww
|
||||
|
||||
MsgDynamicInfoEO msgDynamicInfoEO= msgDynamicInfoEOService.getById(id);
|
||||
MsgDynamicInfoVO msgDynamicInfoVO= beanMapper.map(msgDynamicInfoEO, MsgDynamicInfoVO.class);
|
||||
MsgFileEOPage fileEOPage=new MsgFileEOPage();
|
||||
fileEOPage.setMsgId(id);
|
||||
fileEOPage.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()+"");
|
||||
List<MsgFileEO> fileList= msgFileEOService.queryByList(fileEOPage);
|
||||
if(fileList!=null && !fileList.isEmpty()){
|
||||
List<MsgFileEO> fileEOS=new ArrayList<MsgFileEO>();
|
||||
for(MsgFileEO f:fileList){
|
||||
if(f.getFileType().equals("PIC")){
|
||||
msgDynamicInfoVO.setPicFileEO(f);
|
||||
}else{
|
||||
fileEOS.add(f);
|
||||
}
|
||||
}
|
||||
if(!fileEOS.isEmpty()){
|
||||
msgDynamicInfoVO.setMsgFileEOList(fileEOS);
|
||||
}
|
||||
}
|
||||
return Result.success(msgDynamicInfoVO);
|
||||
}
|
||||
/**
|
||||
* @Author liwenxuan
|
||||
* @Description 新增动态信息表和新增动态信息附件表
|
||||
* 先根据需求判断一些字段不能为空，先新增动态信息表然后生成动态信息数据id，把此id作为新增动态信息附件表中消息id字段新增到动态信息附件表
|
||||
* 调用附件存入动态信息id/文件名称/文件后缀/文件ID
|
||||
* 文件对象private List<MsgFileEO> msgFileEOList = new ArrayList<>();
|
||||
* 根据isPicMsg字段判断传入的是否为图片 private MsgFileEO picFileEO = new MsgFileEO();
|
||||
* @Date Administrator 2018/9/17
|
||||
* @Param [msgDynamicInfoVO]
|
||||
* @return com.adc.da.util.http.ResponseMessage<com.adc.da.lawss.entity.MsgDynamicInfoEO>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|新增")
|
||||
@PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
|
||||
@RequiresPermissions("lawss:msgDynamicInfo:save")
|
||||
public ResponseMessage create(@RequestBody MsgDynamicInfoVO msgDynamicInfoVO) throws Exception {
|
||||
// 发布人和发布组织在数据库中需要存入的是他们对应的id
|
||||
// MsgDynamicInfoEO msgDynamicInfoEO= beanMapper.map(msgDynamicInfoVO, MsgDynamicInfoEO.class);
|
||||
// msgDynamicInfoVO.setContent(msgDynamicInfoVO.getContent().replace("^#^","%"));
|
||||
// msgDynamicInfoVO.setContentText(msgDynamicInfoVO.getContentText().replace("^#^","%"));
|
||||
String msgId= msgDynamicInfoEOService.saveMsgInfo(msgDynamicInfoVO);
|
||||
return Result.success(ResponseMessageCodeEnum.SUCCESS.getCode(),"保存成功",msgId);
|
||||
}
|
||||
/**
|
||||
* @Author liwenxuan
|
||||
* @Description
|
||||
* 1.修改动态信息表
|
||||
* 2.修改动态信息附件表
|
||||
*
|
||||
* @Date Administrator 2018/9/17
|
||||
* @Param [msgDynamicInfoVO]
|
||||
* @return com.adc.da.util.http.ResponseMessage<com.adc.da.lawss.entity.MsgDynamicInfoEO>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|修改")
|
||||
@PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
|
||||
@RequiresPermissions("lawss:msgDynamicInfo:update")
|
||||
public ResponseMessage<MsgDynamicInfoEO> update(@RequestBody MsgDynamicInfoVO msgDynamicInfoVO) throws Exception {
|
||||
// msgDynamicInfoVO.setContent(msgDynamicInfoVO.getContent().replace("^#^","%"));
|
||||
// msgDynamicInfoVO.setContentText(msgDynamicInfoVO.getContentText().replace("^#^","%"));
|
||||
msgDynamicInfoEOService.updateMsgInfo(msgDynamicInfoVO);
|
||||
return Result.success(ResponseMessageCodeEnum.SUCCESS.getCode(),"保存成功",null);
|
||||
}
|
||||
/**
|
||||
* @Author liwenxuan
|
||||
* @Description 删除动态信息表信息（设置valid_flag=1）
|
||||
* @Date Administrator 2018/9/17
|
||||
* @Param [id]
|
||||
* @return com.adc.da.util.http.ResponseMessage
|
||||
**/
|
||||
/* @ApiOperation(value = "|MsgDynamicInfoEO|删除")
|
||||
@DeleteMapping("/{id}")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:delete")
|
||||
public ResponseMessage delete(@PathVariable String id) throws Exception {
|
||||
msgDynamicInfoEOService.deleteByPrimaryKey(id);
|
||||
logger.info("delete from MSG_DYNAMIC_INFO where id = {}", id);
|
||||
return Result.success();
|
||||
}*/
|
||||
|
||||
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|删除")
|
||||
@DeleteMapping("/{ids}")
|
||||
@RequiresPermissions("lawss:msgDynamicInfo:deleteMsgList")
|
||||
public ResponseMessage deleteMsgList(@NotNull @PathVariable("ids") String[] ids) throws Exception {
|
||||
msgDynamicInfoEOService.deleteLogicInBatch(Arrays.asList(ids));
|
||||
// msgDynamicInfoEOService.deleteByPrimaryKey(id);
|
||||
// logger.info("delete from MSG_DYNAMIC_INFO where id = {}", id);
|
||||
return Result.success();
|
||||
}
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 根据id查询详细信息
|
||||
* Date 2018/10/10 11:28
|
||||
* @Param [id]
|
||||
* @return com.adc.da.util.http.ResponseMessage<com.adc.da.lawss.entity.MsgDynamicInfoEO>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|根据id查询详细信息")
|
||||
@GetMapping("/selectByMsgId")
|
||||
public ResponseMessage<MsgDynamicInfoEO> selectByMsgId(String id){
|
||||
MsgDynamicInfoEO result = msgDynamicInfoEOService.selectByMsgId(id);
|
||||
if(result != null){
|
||||
String collectId = personCollectEOService.queryCollectByUserAndId(id);
|
||||
result.setCollectId(collectId);
|
||||
return Result.success(result);
|
||||
} else {
|
||||
return Result.error("无法找到该条信息详情！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 获取新闻图片
|
||||
* Date 2018/10/22 12:56
|
||||
* @Param [page]
|
||||
* @return com.adc.da.util.http.ResponseMessage<com.adc.da.util.http.PageInfo<com.adc.da.lawss.entity.MsgDynamicInfoEO>>
|
||||
**/
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|查询图片")
|
||||
@GetMapping("/queryNewsPic")
|
||||
// @RequiresPermissions("lawss:msgDynamicInfo:queryNewsPic")
|
||||
public ResponseMessage<PageInfo<MsgDynamicInfoEO>> queryNewsPic(MsgDynamicInfoEOPage page) throws Exception {
|
||||
page.setIsPicMsg(ValidFlagEnum.VALID_TRUE.getValue()+"");
|
||||
page.setOrderBy("MSG_DYNAMIC_INFO.pub_time desc");
|
||||
List<MsgDynamicInfoEO> rows = msgDynamicInfoEOService.queryByPage(page);
|
||||
if(rows != null && rows.size()>0){
|
||||
for(MsgDynamicInfoEO row : rows){
|
||||
if(StringUtils.isNotEmpty(row.getAttPicIds())){
|
||||
String attIds[] = row.getAttPicIds().split(",");
|
||||
List<String> paths = new ArrayList<>();
|
||||
for(int i=0;i<attIds.length;i++){
|
||||
AttFileEO attFileEO = attFileEOService.getFileInfo(attIds[i]);
|
||||
if(attFileEO != null){
|
||||
String path = attFileEO.getFilePath()+attFileEO.getFileName();
|
||||
paths.add(path);
|
||||
}
|
||||
}
|
||||
row.setAttPath(paths);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return Result.success(getPageInfo(page.getPager(), rows));
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜索中心页面查询为我推荐
|
||||
* @param
|
||||
* @return
|
||||
* @author gaoyan
|
||||
* date 2018-11-10
|
||||
*/
|
||||
@ApiOperation(value = "|SarStandardsInfoEO|搜索中心页面查询为我推荐")
|
||||
@GetMapping("/selectRecommendMsgDynamicInfo")
|
||||
//@RequiresPermissions("lawss:sarStandardsInfo:list")
|
||||
public ResponseMessage<List<RecommendVO>> selectRecommendStand(MsgDynamicInfoEOPage page) throws Exception {
|
||||
MsgDynamicInfoEO sarStandardsInfoEO = msgDynamicInfoEOService.getById(page.getId());
|
||||
MsgDynamicInfoEOPage pagenew = new MsgDynamicInfoEOPage();
|
||||
if(StringUtils.isNotEmpty(sarStandardsInfoEO.getMsgType())) {
|
||||
pagenew.setMsgType(sarStandardsInfoEO.getMsgType());
|
||||
}
|
||||
List<RecommendVO> resultlist = msgDynamicInfoEOService.selectRecommendMsgDynamicInfo(pagenew);
|
||||
return Result.success(resultlist);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 将查询出来的数据导出到EXCEL表格中
|
||||
* @param idList 导出信息
|
||||
* @return
|
||||
* @author gaoyan
|
||||
* date 2018-11-22
|
||||
*/
|
||||
@ApiOperation(value = "|SysCorpEO|导出excel")
|
||||
@GetMapping(value = "/exportMsgDynamicInfoExcel")
|
||||
public void exportMsgDynamicInfoExcel(String idList, String exportName, HttpServletResponse response, HttpServletRequest request) {
|
||||
OutputStream os = null;
|
||||
Workbook workbook = null;
|
||||
try {
|
||||
if(StringUtils.isEmpty(exportName) ||exportName.equals("null")){
|
||||
exportName="动态信息";
|
||||
}
|
||||
response.setHeader("Content-Disposition",
|
||||
"attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx", request));
|
||||
response.setContentType("application/force-download");
|
||||
ExportParams exportParams = new ExportParams();
|
||||
exportParams.setType(ExcelType.XSSF);
|
||||
MsgDynamicInfoEOPage page = new MsgDynamicInfoEOPage();
|
||||
page.setIdList(idList.split(","));
|
||||
List<MsgDynamicInfoExportDto> datas = msgDynamicInfoEOService.getMsgDynamicInfoForExport(page);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, MsgDynamicInfoExportDto.class, datas);
|
||||
os = response.getOutputStream();
|
||||
workbook.write(os);
|
||||
os.flush();
|
||||
} catch (IOException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
throw new AdcDaBaseException("下载文件失败，请重试");
|
||||
} finally {
|
||||
IOUtils.closeQuietly(os);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|当前角色是否有数据权限")
|
||||
@GetMapping(value = "/showDetailsByRole")
|
||||
public ResponseMessage<List<MsgDynamicInfoEO>> showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO) throws Exception{
|
||||
// 根据当前登录人id查出对应角色
|
||||
String roleIds = UserUtils.getRoleIds();
|
||||
String[] roleArr = roleIds.split(",");
|
||||
List<String> roleIdList = Arrays.asList(roleArr);
|
||||
msgDynamicInfoEO.setRoleIds(roleIdList);
|
||||
List<MsgDynamicInfoEO> getMsg = msgDynamicInfoEOService.showDetailsByRole(msgDynamicInfoEO);
|
||||
return Result.success(getMsg);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|MsgDynamicInfoEO|获取系统当前时间")
|
||||
@GetMapping(value = "/getSystemTime")
|
||||
public ResponseMessage<Date> getSystemTime() throws Exception{
|
||||
return Result.success(new Date());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.dao;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.dto.MsgDynamicInfoExportDto;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgDynamicInfoEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgDynamicInfoEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.RecommendVO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEODao<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface MsgDynamicInfoEODao extends BaseMapper<MsgDynamicInfoEO> {
|
||||
|
||||
Integer updateIdOfMsgFile(List<MsgFileEO> msgFileEOS);
|
||||
|
||||
|
||||
public void deleteLogicInBatch(List<String> ids);
|
||||
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 根据id查询详细信息
|
||||
* Date 2018/10/10 11:23
|
||||
* @Param [id]
|
||||
* @return com.adc.da.lawss.entity.MsgDynamicInfoEO
|
||||
**/
|
||||
MsgDynamicInfoEO selectByMsgId(String id);
|
||||
|
||||
// liwenxuan:动态信息更新数量：国际动态INLAND
|
||||
Integer selectDynamicInfoUpdateNumINLAND(Date visitTime);
|
||||
// liwenxuan:动态信息更新数量：国际动态FOREIGN
|
||||
Integer selectDynamicInfoUpdateNumFOREIGN(Date visitTime);
|
||||
|
||||
// liwenxuan:动态信息更新数量：国际动态INLANDAll
|
||||
Integer selectDynamicInfoUpdateNumINLANDAll();
|
||||
// liwenxuan:动态信息更新数量：国际动态FOREIGNAll
|
||||
Integer selectDynamicInfoUpdateNumFOREIGNAll();
|
||||
|
||||
/**
|
||||
* 搜索中心查询相关推荐
|
||||
*
|
||||
* @param:
|
||||
* @auther: gaoyan
|
||||
* @date: 2018/11/10 9:22
|
||||
*/
|
||||
List<RecommendVO> selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew);
|
||||
|
||||
|
||||
List<MsgDynamicInfoExportDto> getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page);
|
||||
|
||||
List<MsgDynamicInfoEO> showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO);
|
||||
|
||||
List<MsgDynamicInfoEO> queryAllByPage(MsgDynamicInfoEOPage msgDynamicInfoEO);
|
||||
|
||||
int updateByPrimaryKeySelective(MsgDynamicInfoEO msgDynamicInfoEO);
|
||||
|
||||
int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO);
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.dao;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgFileEOPage;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_FILE MsgFileEODao<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
@Repository
|
||||
public interface MsgFileEODao extends BaseMapper<MsgFileEO> {
|
||||
|
||||
//修改动态信息附件表
|
||||
void updateByPrimaryKeySelective(MsgFileEO msgFileEO);
|
||||
|
||||
/****
|
||||
* 批量删除 根据消息ID
|
||||
* @MethodName:deleteLogicInBatch
|
||||
* @author: zhangyanduan
|
||||
* @param:[ids]
|
||||
* @return:void
|
||||
* date: 2018/9/18 17:05
|
||||
*/
|
||||
public void deleteLogicInBatch(List<String> ids );
|
||||
|
||||
List<MsgFileEO> queryByList(MsgFileEOPage msgFileEOPage);
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.dao;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.SarStandAndLawsEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.SarStandAndLawsEOPage;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 标准和法规联合查询
|
||||
*
|
||||
* @Author SYT
|
||||
* @CreateTime 2018/10/23 14:30
|
||||
* @attention
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface SarStandAndLawsEODao extends BaseMapper<SarStandAndLawsEO> {
|
||||
List<SarStandAndLawsEO> selectStandAndLawsInfo(SarStandAndLawsEOPage page);
|
||||
|
||||
Integer selectStandAndLawsInfoCount(SarStandAndLawsEOPage page);
|
||||
|
||||
List<SarStandAndLawsEO> selectStand(SarStandAndLawsEOPage page);
|
||||
Integer selectStandCount(SarStandAndLawsEOPage page);
|
||||
|
||||
|
||||
List<SarStandAndLawsEO> selectStandNameAndType(String showNumber);
|
||||
|
||||
List<SarStandAndLawsEO> queryByNameNumber(SarStandAndLawsEOPage page);
|
||||
|
||||
}
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.dto;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.adc.da.excel.annotation.Excel;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEOEntity<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class MsgDynamicInfoExportDto extends BaseEntity {
|
||||
@Excel(name = "发布单位", orderNum = "8",width = 10)
|
||||
private String pubOrg;
|
||||
@Excel(name = "发布人", orderNum = "7",width = 10)
|
||||
private String pubUser;
|
||||
@Excel(name = "发布日期", orderNum = "6", exportFormat = "yyyy/MM/dd",width = 12)
|
||||
private Date pubTime;
|
||||
@Excel(name = "消息链接", orderNum = "5",width = 10)
|
||||
private String linkUri;
|
||||
@Excel(name = "消息内容", orderNum = "4",width = 10)
|
||||
private String content;
|
||||
@Excel(name = "消息标题", orderNum = "3",width = 10)
|
||||
private String title;
|
||||
@Excel(name = "所属模块", orderNum = "2",width = 10)
|
||||
private String msgMode;
|
||||
@Excel(name = "消息类型", orderNum = "1",width = 10)
|
||||
private String msgType;
|
||||
|
||||
public String getPubOrg() {
|
||||
return pubOrg;
|
||||
}
|
||||
|
||||
public void setPubOrg(String pubOrg) {
|
||||
this.pubOrg = pubOrg;
|
||||
}
|
||||
|
||||
public String getPubUser() {
|
||||
return pubUser;
|
||||
}
|
||||
|
||||
public void setPubUser(String pubUser) {
|
||||
this.pubUser = pubUser;
|
||||
}
|
||||
|
||||
public Date getPubTime() {
|
||||
return pubTime;
|
||||
}
|
||||
|
||||
public void setPubTime(Date pubTime) {
|
||||
this.pubTime = pubTime;
|
||||
}
|
||||
|
||||
public String getLinkUri() {
|
||||
return linkUri;
|
||||
}
|
||||
|
||||
public void setLinkUri(String linkUri) {
|
||||
this.linkUri = linkUri;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getMsgMode() {
|
||||
return msgMode;
|
||||
}
|
||||
|
||||
public void setMsgMode(String msgMode) {
|
||||
this.msgMode = msgMode;
|
||||
}
|
||||
|
||||
public String getMsgType() {
|
||||
return msgType;
|
||||
}
|
||||
|
||||
public void setMsgType(String msgType) {
|
||||
this.msgType = msgType;
|
||||
}
|
||||
}
|
||||
+409
@@ -0,0 +1,409 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEOEntity<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class MsgDynamicInfoEO extends BaseEntity {
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
private Integer validFlag;
|
||||
private String pubOrg;//资料来源
|
||||
private String pubUser;//上传人员
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pubTime;//上传日期
|
||||
private String linkUri;//标签
|
||||
private String content;
|
||||
private String title;//资料名称
|
||||
private String msgMode;//资料类别
|
||||
private String msgType;
|
||||
private String id;
|
||||
|
||||
private String pubUserName;
|
||||
private String pubOrgName;
|
||||
private String moduleName;
|
||||
private String attId;
|
||||
private String attPicIds;
|
||||
private List<String> attPath;
|
||||
private Integer isPicMsg;
|
||||
//记录上传的文件和图片
|
||||
private List<MsgFileEO> getPicList;
|
||||
private List<MsgFileEO> getFileList;
|
||||
//记录收藏id
|
||||
private String collectId;
|
||||
private String contentText;
|
||||
private List<String> roleIds;
|
||||
private String saveStatus;
|
||||
|
||||
private String saveLevel;//保密等级
|
||||
private String releventGroup;//相关工作组
|
||||
private String releventStand;//相关标准
|
||||
private String releventLaws;//相关政策
|
||||
private String dataText;//资料文本
|
||||
private String source;//数据来源（pre会前流程，after会后流程，空页面新增）
|
||||
|
||||
|
||||
/**
|
||||
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modifyTime -> modify_time</li>
|
||||
* <li>creationTime -> creation_time</li>
|
||||
* <li>validFlag -> valid_flag</li>
|
||||
* <li>pubOrg -> pub_org</li>
|
||||
* <li>pubUser -> pub_user</li>
|
||||
* <li>pubTime -> pub_time</li>
|
||||
* <li>linkUri -> link_uri</li>
|
||||
* <li>content -> content</li>
|
||||
* <li>title -> title</li>
|
||||
* <li>msgMode -> msg_mode</li>
|
||||
* <li>msgType -> msg_type</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String fieldToColumn(String fieldName) {
|
||||
if (fieldName == null){ return null;}
|
||||
switch (fieldName) {
|
||||
case "modifyTime": return "modify_time";
|
||||
case "creationTime": return "creation_time";
|
||||
case "validFlag": return "valid_flag";
|
||||
case "pubOrg": return "pub_org";
|
||||
case "pubUser": return "pub_user";
|
||||
case "pubTime": return "pub_time";
|
||||
case "linkUri": return "link_uri";
|
||||
case "content": return "content";
|
||||
case "title": return "title";
|
||||
case "msgMode": return "msg_mode";
|
||||
case "msgType": return "msg_type";
|
||||
case "contentText": return "content_text";
|
||||
case "id": return "id";
|
||||
case "isPicMsg": return "is_pic_msg";
|
||||
case "saveLevel": return "save_level";
|
||||
case "releventStand": return "relevent_stand";
|
||||
case "releventLaws": return "relevent_laws";
|
||||
case "dataText": return "data_text";
|
||||
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modify_time -> modifyTime</li>
|
||||
* <li>creation_time -> creationTime</li>
|
||||
* <li>valid_flag -> validFlag</li>
|
||||
* <li>pub_org -> pubOrg</li>
|
||||
* <li>pub_user -> pubUser</li>
|
||||
* <li>pub_time -> pubTime</li>
|
||||
* <li>link_uri -> linkUri</li>
|
||||
* <li>content -> content</li>
|
||||
* <li>title -> title</li>
|
||||
* <li>msg_mode -> msgMode</li>
|
||||
* <li>msg_type -> msgType</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String columnToField(String columnName) {
|
||||
if (columnName == null){ return null;}
|
||||
switch (columnName) {
|
||||
case "modify_time": return "modifyTime";
|
||||
case "creation_time": return "creationTime";
|
||||
case "valid_flag": return "validFlag";
|
||||
case "pub_org": return "pubOrg";
|
||||
case "pub_user": return "pubUser";
|
||||
case "pub_time": return "pubTime";
|
||||
case "link_uri": return "linkUri";
|
||||
case "content": return "content";
|
||||
case "title": return "title";
|
||||
case "msg_mode": return "msgMode";
|
||||
case "msg_type": return "msgType";
|
||||
case "content_text": return "contentText";
|
||||
case "id": return "id";
|
||||
case "is_pic_msg": return "isPicMsg";
|
||||
case "save_level": return "saveLevel";
|
||||
case "relevent_stand": return "relevent_stand";
|
||||
case "relevent_laws": return "releventLaws";
|
||||
case "data_text": return "dataText";
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Date getModifyTime() {
|
||||
return this.modifyTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setModifyTime(Date modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Date getCreationTime() {
|
||||
return this.creationTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setCreationTime(Date creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Integer getValidFlag() {
|
||||
return this.validFlag;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setValidFlag(Integer validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getPubOrg() {
|
||||
return this.pubOrg;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setPubOrg(String pubOrg) {
|
||||
this.pubOrg = pubOrg;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getPubUser() {
|
||||
return this.pubUser;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setPubUser(String pubUser) {
|
||||
this.pubUser = pubUser;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Date getPubTime() {
|
||||
return this.pubTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setPubTime(Date pubTime) {
|
||||
this.pubTime = pubTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getLinkUri() {
|
||||
return this.linkUri;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setLinkUri(String linkUri) {
|
||||
this.linkUri = linkUri;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getTitle() {
|
||||
return this.title;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getMsgMode() {
|
||||
return this.msgMode;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setMsgMode(String msgMode) {
|
||||
this.msgMode = msgMode;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getMsgType() {
|
||||
return this.msgType;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setMsgType(String msgType) {
|
||||
this.msgType = msgType;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void setPubUserName(String pubUserName){
|
||||
this.pubUserName=pubUserName;
|
||||
}
|
||||
|
||||
public String getPubUserName(){
|
||||
return this.pubUserName;
|
||||
}
|
||||
|
||||
public void setIsPicMsg(Integer isPicMsg){
|
||||
this.isPicMsg=isPicMsg;
|
||||
}
|
||||
|
||||
public Integer getIsPicMsg(){
|
||||
return this.isPicMsg;
|
||||
}
|
||||
|
||||
public String getPubOrgName() {
|
||||
return pubOrgName;
|
||||
}
|
||||
|
||||
public void setPubOrgName(String pubOrgName) {
|
||||
this.pubOrgName = pubOrgName;
|
||||
}
|
||||
|
||||
public List<MsgFileEO> getGetPicList() {
|
||||
return getPicList;
|
||||
}
|
||||
|
||||
public void setGetPicList(List<MsgFileEO> getPicList) {
|
||||
this.getPicList = getPicList;
|
||||
}
|
||||
|
||||
public List<MsgFileEO> getGetFileList() {
|
||||
return getFileList;
|
||||
}
|
||||
|
||||
public void setGetFileList(List<MsgFileEO> getFileList) {
|
||||
this.getFileList = getFileList;
|
||||
}
|
||||
|
||||
public String getCollectId() {
|
||||
return collectId;
|
||||
}
|
||||
|
||||
public void setCollectId(String collectId) {
|
||||
this.collectId = collectId;
|
||||
}
|
||||
|
||||
public String getModuleName() {
|
||||
return moduleName;
|
||||
}
|
||||
|
||||
public void setModuleName(String moduleName) {
|
||||
this.moduleName = moduleName;
|
||||
}
|
||||
|
||||
public String getAttId() {
|
||||
return attId;
|
||||
}
|
||||
|
||||
public void setAttId(String attId) {
|
||||
this.attId = attId;
|
||||
}
|
||||
|
||||
public List<String> getAttPath() {
|
||||
return attPath;
|
||||
}
|
||||
|
||||
public void setAttPath(List<String> attPath) {
|
||||
this.attPath = attPath;
|
||||
}
|
||||
|
||||
public String getAttPicIds() {
|
||||
return attPicIds;
|
||||
}
|
||||
|
||||
public void setAttPicIds(String attPicIds) {
|
||||
this.attPicIds = attPicIds;
|
||||
}
|
||||
|
||||
public String getContentText() {
|
||||
return contentText;
|
||||
}
|
||||
|
||||
public void setContentText(String contentText) {
|
||||
this.contentText = contentText;
|
||||
}
|
||||
|
||||
public List<String> getRoleIds() {
|
||||
return roleIds;
|
||||
}
|
||||
|
||||
public void setRoleIds(List<String> roleIds) {
|
||||
this.roleIds = roleIds;
|
||||
}
|
||||
|
||||
public String getSaveStatus() {
|
||||
return saveStatus;
|
||||
}
|
||||
|
||||
public void setSaveStatus(String saveStatus) {
|
||||
this.saveStatus = saveStatus;
|
||||
}
|
||||
|
||||
public String getSaveLevel() {
|
||||
return saveLevel;
|
||||
}
|
||||
|
||||
public void setSaveLevel(String saveLevel) {
|
||||
this.saveLevel = saveLevel;
|
||||
}
|
||||
|
||||
public String getReleventStand() {
|
||||
return releventStand;
|
||||
}
|
||||
|
||||
public void setReleventStand(String releventStand) {
|
||||
this.releventStand = releventStand;
|
||||
}
|
||||
|
||||
public String getReleventLaws() {
|
||||
return releventLaws;
|
||||
}
|
||||
|
||||
public void setReleventLaws(String releventLaws) {
|
||||
this.releventLaws = releventLaws;
|
||||
}
|
||||
|
||||
public String getDataText() {
|
||||
return dataText;
|
||||
}
|
||||
|
||||
public void setDataText(String dataText) {
|
||||
this.dataText = dataText;
|
||||
}
|
||||
|
||||
public String getReleventGroup() {
|
||||
return releventGroup;
|
||||
}
|
||||
|
||||
public void setReleventGroup(String releventGroup) {
|
||||
this.releventGroup = releventGroup;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,223 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>MSG_FILE MsgFileEOEntity<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class MsgFileEO extends BaseEntity {
|
||||
|
||||
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
private Integer validFlag;
|
||||
private String attId;
|
||||
private String fileSuffix;
|
||||
private String fileName;
|
||||
private String msgId;
|
||||
private String id;
|
||||
|
||||
private String name;
|
||||
private String oldFileName;
|
||||
private String status="finished";
|
||||
|
||||
private String fileType;
|
||||
private String filePath;
|
||||
|
||||
private String originFileName;
|
||||
|
||||
/**
|
||||
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modifyTime -> modify_time</li>
|
||||
* <li>creationTime -> creation_time</li>
|
||||
* <li>validFlag -> valid_flag</li>
|
||||
* <li>attId -> att_id</li>
|
||||
* <li>fileSuffix -> file_suffix</li>
|
||||
* <li>fileName -> file_name</li>
|
||||
* <li>msgId -> msg_id</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String fieldToColumn(String fieldName) {
|
||||
if (fieldName == null){ return null;}
|
||||
switch (fieldName) {
|
||||
case "modifyTime": return "modify_time";
|
||||
case "creationTime": return "creation_time";
|
||||
case "validFlag": return "valid_flag";
|
||||
case "attId": return "att_id";
|
||||
case "fileSuffix": return "file_suffix";
|
||||
case "fileName": return "file_name";
|
||||
case "msgId": return "msg_id";
|
||||
case "id": return "id";
|
||||
case "fileType": return "file_type";
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modify_time -> modifyTime</li>
|
||||
* <li>creation_time -> creationTime</li>
|
||||
* <li>valid_flag -> validFlag</li>
|
||||
* <li>att_id -> attId</li>
|
||||
* <li>file_suffix -> fileSuffix</li>
|
||||
* <li>file_name -> fileName</li>
|
||||
* <li>msg_id -> msgId</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String columnToField(String columnName) {
|
||||
if (columnName == null){ return null;}
|
||||
switch (columnName) {
|
||||
case "modify_time": return "modifyTime";
|
||||
case "creation_time": return "creationTime";
|
||||
case "valid_flag": return "validFlag";
|
||||
case "att_id": return "attId";
|
||||
case "file_suffix": return "fileSuffix";
|
||||
case "file_name": return "fileName";
|
||||
case "msg_id": return "msgId";
|
||||
case "id": return "id";
|
||||
case "file_type": return "fileType";
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Date getModifyTime() {
|
||||
return this.modifyTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setModifyTime(Date modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Date getCreationTime() {
|
||||
return this.creationTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setCreationTime(Date creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public Integer getValidFlag() {
|
||||
return this.validFlag;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setValidFlag(Integer validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getAttId() {
|
||||
return this.attId;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setAttId(String attId) {
|
||||
this.attId = attId;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getFileSuffix() {
|
||||
return this.fileSuffix;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setFileSuffix(String fileSuffix) {
|
||||
this.fileSuffix = fileSuffix;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getFileName() {
|
||||
return this.fileName;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setFileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getMsgId() {
|
||||
return this.msgId;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setMsgId(String msgId) {
|
||||
this.msgId = msgId;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
/** **/
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getFileType() {
|
||||
return fileType;
|
||||
}
|
||||
|
||||
public void setFileType(String fileType) {
|
||||
this.fileType = fileType;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
this.name=this.fileName;
|
||||
return this.name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
this.fileName = name;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getOldFileName() {
|
||||
this.oldFileName = this.fileName;
|
||||
return this.oldFileName;
|
||||
}
|
||||
|
||||
public void setOldFileName(String oldFileName) {
|
||||
this.oldFileName = oldFileName;
|
||||
}
|
||||
|
||||
public String getFilePath() {
|
||||
return filePath;
|
||||
}
|
||||
|
||||
public void setFilePath(String filePath) {
|
||||
this.filePath = filePath;
|
||||
}
|
||||
|
||||
public String getOriginFileName() {
|
||||
return originFileName;
|
||||
}
|
||||
|
||||
public void setOriginFileName(String originFileName) {
|
||||
this.originFileName = originFileName;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+157
@@ -0,0 +1,157 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
|
||||
/**
|
||||
* 标准和法规联合查询
|
||||
*
|
||||
* @Author SYT
|
||||
* @CreateTime 2018/10/23 14:13
|
||||
* @attention
|
||||
*/
|
||||
public class SarStandAndLawsEO extends BaseEntity {
|
||||
private String id;
|
||||
private String showNumber;
|
||||
private String country;
|
||||
private String showName;
|
||||
private String typeShow;
|
||||
private String standYear;
|
||||
private String issueTime;
|
||||
private String putTime;
|
||||
private String productPutTime;
|
||||
private String newproductPutTime;
|
||||
private String standStateShow;
|
||||
private String responsibleUnitId;
|
||||
private String responsibleUnitName;
|
||||
private String categoryShow;
|
||||
private String applyArcticShow;
|
||||
private String natureShow;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getShowNumber() {
|
||||
return showNumber;
|
||||
}
|
||||
|
||||
public void setShowNumber(String showNumber) {
|
||||
this.showNumber = showNumber;
|
||||
}
|
||||
|
||||
public String getCountry() {
|
||||
return country;
|
||||
}
|
||||
|
||||
public void setCountry(String country) {
|
||||
this.country = country;
|
||||
}
|
||||
|
||||
public String getShowName() {
|
||||
return showName;
|
||||
}
|
||||
|
||||
public void setShowName(String showName) {
|
||||
this.showName = showName;
|
||||
}
|
||||
|
||||
public String getTypeShow() {
|
||||
return typeShow;
|
||||
}
|
||||
|
||||
public void setTypeShow(String typeShow) {
|
||||
this.typeShow = typeShow;
|
||||
}
|
||||
|
||||
public String getStandYear() {
|
||||
return standYear;
|
||||
}
|
||||
|
||||
public void setStandYear(String standYear) {
|
||||
this.standYear = standYear;
|
||||
}
|
||||
|
||||
public String getIssueTime() {
|
||||
return issueTime;
|
||||
}
|
||||
|
||||
public void setIssueTime(String issueTime) {
|
||||
this.issueTime = issueTime;
|
||||
}
|
||||
|
||||
public String getProductPutTime() {
|
||||
return productPutTime;
|
||||
}
|
||||
|
||||
public void setProductPutTime(String productPutTime) {
|
||||
this.productPutTime = productPutTime;
|
||||
}
|
||||
|
||||
public String getNewproductPutTime() {
|
||||
return newproductPutTime;
|
||||
}
|
||||
|
||||
public void setNewproductPutTime(String newproductPutTime) {
|
||||
this.newproductPutTime = newproductPutTime;
|
||||
}
|
||||
|
||||
public String getStandStateShow() {
|
||||
return standStateShow;
|
||||
}
|
||||
|
||||
public void setStandStateShow(String standStateShow) {
|
||||
this.standStateShow = standStateShow;
|
||||
}
|
||||
|
||||
public String getResponsibleUnitId() {
|
||||
return responsibleUnitId;
|
||||
}
|
||||
|
||||
public void setResponsibleUnitId(String responsibleUnitId) {
|
||||
this.responsibleUnitId = responsibleUnitId;
|
||||
}
|
||||
|
||||
public String getResponsibleUnitName() {
|
||||
return responsibleUnitName;
|
||||
}
|
||||
|
||||
public void setResponsibleUnitName(String responsibleUnitName) {
|
||||
this.responsibleUnitName = responsibleUnitName;
|
||||
}
|
||||
|
||||
public String getCategoryShow() {
|
||||
return categoryShow;
|
||||
}
|
||||
|
||||
public void setCategoryShow(String categoryShow) {
|
||||
this.categoryShow = categoryShow;
|
||||
}
|
||||
|
||||
public String getApplyArcticShow() {
|
||||
return applyArcticShow;
|
||||
}
|
||||
|
||||
public void setApplyArcticShow(String applyArcticShow) {
|
||||
this.applyArcticShow = applyArcticShow;
|
||||
}
|
||||
|
||||
public String getNatureShow() {
|
||||
return natureShow;
|
||||
}
|
||||
|
||||
public void setNatureShow(String natureShow) {
|
||||
this.natureShow = natureShow;
|
||||
}
|
||||
|
||||
public String getPutTime() {
|
||||
return putTime;
|
||||
}
|
||||
|
||||
public void setPutTime(String putTime) {
|
||||
this.putTime = putTime;
|
||||
}
|
||||
}
|
||||
+428
@@ -0,0 +1,428 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.page;
|
||||
|
||||
import com.adc.da.sys.common.BasePage;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEOPage<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class MsgDynamicInfoEOPage extends BasePage {
|
||||
|
||||
private String modifyTime;
|
||||
private String modifyTime1;
|
||||
private String modifyTime2;
|
||||
private String modifyTimeOperator = "=";
|
||||
private String creationTime;
|
||||
private String creationTime1;
|
||||
private String creationTime2;
|
||||
private String creationTimeOperator = "=";
|
||||
private String validFlag;
|
||||
private String validFlagOperator = "=";
|
||||
private String pubOrg;
|
||||
private String pubOrgOperator = "=";
|
||||
private String pubUser;
|
||||
private String pubUserOperator = "=";
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pubTime;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pubTime1;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pubTime2;
|
||||
private String pubTimeOperator = "=";
|
||||
private String linkUri;
|
||||
private String linkUriOperator = "=";
|
||||
private String content;
|
||||
private String contentOperator = "=";
|
||||
private String title;
|
||||
private String titleOperator = "like";
|
||||
private String msgMode;
|
||||
private String msgModeOperator = "=";
|
||||
private String msgType;
|
||||
private String msgTypeOperator = "=";
|
||||
private String id;
|
||||
private String idOperator = "=";
|
||||
private String isPicMsg;
|
||||
private String isPicMsgOperator = "=";
|
||||
private String saveLevel;
|
||||
private String saveLevelOperator = "=";
|
||||
private String releventStand;
|
||||
private String releventStandOperator = "=";
|
||||
private String releventLaws;
|
||||
private String releventLawsOperator = "=";
|
||||
private String source;
|
||||
private String dataText;
|
||||
private String dataTextOperator = "=";
|
||||
|
||||
|
||||
//限制显示条数，消息动态主页会用到
|
||||
private int rowLimit;
|
||||
private String moduleName;
|
||||
private String contentText;
|
||||
|
||||
private String[] idList;
|
||||
|
||||
public String getModifyTime() {
|
||||
return this.modifyTime;
|
||||
}
|
||||
|
||||
public void setModifyTime(String modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
public String getModifyTime1() {
|
||||
return this.modifyTime1;
|
||||
}
|
||||
|
||||
public void setModifyTime1(String modifyTime1) {
|
||||
this.modifyTime1 = modifyTime1;
|
||||
}
|
||||
|
||||
public String getModifyTime2() {
|
||||
return this.modifyTime2;
|
||||
}
|
||||
|
||||
public void setModifyTime2(String modifyTime2) {
|
||||
this.modifyTime2 = modifyTime2;
|
||||
}
|
||||
|
||||
public String getModifyTimeOperator() {
|
||||
return this.modifyTimeOperator;
|
||||
}
|
||||
|
||||
public void setModifyTimeOperator(String modifyTimeOperator) {
|
||||
this.modifyTimeOperator = modifyTimeOperator;
|
||||
}
|
||||
|
||||
public String getCreationTime() {
|
||||
return this.creationTime;
|
||||
}
|
||||
|
||||
public void setCreationTime(String creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
public String getCreationTime1() {
|
||||
return this.creationTime1;
|
||||
}
|
||||
|
||||
public void setCreationTime1(String creationTime1) {
|
||||
this.creationTime1 = creationTime1;
|
||||
}
|
||||
|
||||
public String getCreationTime2() {
|
||||
return this.creationTime2;
|
||||
}
|
||||
|
||||
public void setCreationTime2(String creationTime2) {
|
||||
this.creationTime2 = creationTime2;
|
||||
}
|
||||
|
||||
public String getCreationTimeOperator() {
|
||||
return this.creationTimeOperator;
|
||||
}
|
||||
|
||||
public void setCreationTimeOperator(String creationTimeOperator) {
|
||||
this.creationTimeOperator = creationTimeOperator;
|
||||
}
|
||||
|
||||
public String getValidFlag() {
|
||||
return this.validFlag;
|
||||
}
|
||||
|
||||
public void setValidFlag(String validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
public String getValidFlagOperator() {
|
||||
return this.validFlagOperator;
|
||||
}
|
||||
|
||||
public void setValidFlagOperator(String validFlagOperator) {
|
||||
this.validFlagOperator = validFlagOperator;
|
||||
}
|
||||
|
||||
public String getPubOrg() {
|
||||
return this.pubOrg;
|
||||
}
|
||||
|
||||
public void setPubOrg(String pubOrg) {
|
||||
this.pubOrg = pubOrg;
|
||||
}
|
||||
|
||||
public String getPubOrgOperator() {
|
||||
return this.pubOrgOperator;
|
||||
}
|
||||
|
||||
public void setPubOrgOperator(String pubOrgOperator) {
|
||||
this.pubOrgOperator = pubOrgOperator;
|
||||
}
|
||||
|
||||
public String getPubUser() {
|
||||
return this.pubUser;
|
||||
}
|
||||
|
||||
public void setPubUser(String pubUser) {
|
||||
this.pubUser = pubUser;
|
||||
}
|
||||
|
||||
public String getPubUserOperator() {
|
||||
return this.pubUserOperator;
|
||||
}
|
||||
|
||||
public void setPubUserOperator(String pubUserOperator) {
|
||||
this.pubUserOperator = pubUserOperator;
|
||||
}
|
||||
|
||||
public Date getPubTime() {
|
||||
return pubTime;
|
||||
}
|
||||
|
||||
public void setPubTime(Date pubTime) {
|
||||
this.pubTime = pubTime;
|
||||
}
|
||||
|
||||
public Date getPubTime1() {
|
||||
return pubTime1;
|
||||
}
|
||||
|
||||
public void setPubTime1(Date pubTime1) {
|
||||
this.pubTime1 = pubTime1;
|
||||
}
|
||||
|
||||
public Date getPubTime2() {
|
||||
return pubTime2;
|
||||
}
|
||||
|
||||
public void setPubTime2(Date pubTime2) {
|
||||
this.pubTime2 = pubTime2;
|
||||
}
|
||||
|
||||
public String getPubTimeOperator() {
|
||||
return this.pubTimeOperator;
|
||||
}
|
||||
|
||||
public void setPubTimeOperator(String pubTimeOperator) {
|
||||
this.pubTimeOperator = pubTimeOperator;
|
||||
}
|
||||
|
||||
public String getLinkUri() {
|
||||
return this.linkUri;
|
||||
}
|
||||
|
||||
public void setLinkUri(String linkUri) {
|
||||
this.linkUri = linkUri;
|
||||
}
|
||||
|
||||
public String getLinkUriOperator() {
|
||||
return this.linkUriOperator;
|
||||
}
|
||||
|
||||
public void setLinkUriOperator(String linkUriOperator) {
|
||||
this.linkUriOperator = linkUriOperator;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return this.content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
public String getContentOperator() {
|
||||
return this.contentOperator;
|
||||
}
|
||||
|
||||
public void setContentOperator(String contentOperator) {
|
||||
this.contentOperator = contentOperator;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return this.title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getTitleOperator() {
|
||||
return this.titleOperator;
|
||||
}
|
||||
|
||||
public void setTitleOperator(String titleOperator) {
|
||||
this.titleOperator = titleOperator;
|
||||
}
|
||||
|
||||
public String getMsgMode() {
|
||||
return this.msgMode;
|
||||
}
|
||||
|
||||
public void setMsgMode(String msgMode) {
|
||||
this.msgMode = msgMode;
|
||||
}
|
||||
|
||||
public String getMsgModeOperator() {
|
||||
return this.msgModeOperator;
|
||||
}
|
||||
|
||||
public void setMsgModeOperator(String msgModeOperator) {
|
||||
this.msgModeOperator = msgModeOperator;
|
||||
}
|
||||
|
||||
public String getMsgType() {
|
||||
return this.msgType;
|
||||
}
|
||||
|
||||
public void setMsgType(String msgType) {
|
||||
this.msgType = msgType;
|
||||
}
|
||||
|
||||
public String getMsgTypeOperator() {
|
||||
return this.msgTypeOperator;
|
||||
}
|
||||
|
||||
public void setMsgTypeOperator(String msgTypeOperator) {
|
||||
this.msgTypeOperator = msgTypeOperator;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getIdOperator() {
|
||||
return this.idOperator;
|
||||
}
|
||||
|
||||
public void setIdOperator(String idOperator) {
|
||||
this.idOperator = idOperator;
|
||||
}
|
||||
|
||||
public void setIsPicMsg(String isPicMsg) {
|
||||
this.isPicMsg = isPicMsg;
|
||||
}
|
||||
|
||||
public String getIsPicMsg() {
|
||||
return this.isPicMsg;
|
||||
}
|
||||
|
||||
public void setIsPicMsgOperator(String isPicMsgOperator) {
|
||||
this.isPicMsgOperator = isPicMsgOperator;
|
||||
}
|
||||
|
||||
public String getIsPicMsgOperator() {
|
||||
return this.isPicMsgOperator;
|
||||
}
|
||||
|
||||
public int getRowLimit() {
|
||||
return rowLimit;
|
||||
}
|
||||
|
||||
public void setRowLimit(int rowLimit) {
|
||||
this.rowLimit = rowLimit;
|
||||
}
|
||||
|
||||
public String getModuleName() {
|
||||
return moduleName;
|
||||
}
|
||||
|
||||
public void setModuleName(String moduleName) {
|
||||
this.moduleName = moduleName;
|
||||
}
|
||||
|
||||
public String getContentText() {
|
||||
return contentText;
|
||||
}
|
||||
|
||||
public void setContentText(String contentText) {
|
||||
this.contentText = contentText;
|
||||
}
|
||||
|
||||
public String[] getIdList() {
|
||||
return idList;
|
||||
}
|
||||
|
||||
public void setIdList(String[] idList) {
|
||||
this.idList = idList;
|
||||
}
|
||||
|
||||
public String getSaveLevel() {
|
||||
return saveLevel;
|
||||
}
|
||||
|
||||
public void setSaveLevel(String saveLevel) {
|
||||
this.saveLevel = saveLevel;
|
||||
}
|
||||
|
||||
public String getSaveLevelOperator() {
|
||||
return saveLevelOperator;
|
||||
}
|
||||
|
||||
public void setSaveLevelOperator(String saveLevelOperator) {
|
||||
this.saveLevelOperator = saveLevelOperator;
|
||||
}
|
||||
|
||||
public String getReleventStand() {
|
||||
return releventStand;
|
||||
}
|
||||
|
||||
public void setReleventStand(String releventStand) {
|
||||
this.releventStand = releventStand;
|
||||
}
|
||||
|
||||
public String getReleventStandOperator() {
|
||||
return releventStandOperator;
|
||||
}
|
||||
|
||||
public void setReleventStandOperator(String releventStandOperator) {
|
||||
this.releventStandOperator = releventStandOperator;
|
||||
}
|
||||
|
||||
public String getReleventLaws() {
|
||||
return releventLaws;
|
||||
}
|
||||
|
||||
public void setReleventLaws(String releventLaws) {
|
||||
this.releventLaws = releventLaws;
|
||||
}
|
||||
|
||||
public String getReleventLawsOperator() {
|
||||
return releventLawsOperator;
|
||||
}
|
||||
|
||||
public void setReleventLawsOperator(String releventLawsOperator) {
|
||||
this.releventLawsOperator = releventLawsOperator;
|
||||
}
|
||||
|
||||
public String getDataText() {
|
||||
return dataText;
|
||||
}
|
||||
|
||||
public void setDataText(String dataText) {
|
||||
this.dataText = dataText;
|
||||
}
|
||||
|
||||
public String getDataTextOperator() {
|
||||
return dataTextOperator;
|
||||
}
|
||||
|
||||
public void setDataTextOperator(String dataTextOperator) {
|
||||
this.dataTextOperator = dataTextOperator;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.page;
|
||||
|
||||
import com.adc.da.sys.common.BasePage;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>MSG_FILE MsgFileEOPage<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class MsgFileEOPage extends BasePage {
|
||||
|
||||
private String modifyTime;
|
||||
private String modifyTime1;
|
||||
private String modifyTime2;
|
||||
private String modifyTimeOperator = "=";
|
||||
private String creationTime;
|
||||
private String creationTime1;
|
||||
private String creationTime2;
|
||||
private String creationTimeOperator = "=";
|
||||
private String validFlag;
|
||||
private String validFlagOperator = "=";
|
||||
private String attId;
|
||||
private String attIdOperator = "=";
|
||||
private String fileSuffix;
|
||||
private String fileSuffixOperator = "=";
|
||||
private String fileName;
|
||||
private String fileNameOperator = "=";
|
||||
private String msgId;
|
||||
private String msgIdOperator = "=";
|
||||
private String id;
|
||||
private String idOperator = "=";
|
||||
|
||||
private String fileType;
|
||||
private String fileTypeOperator = "=";
|
||||
|
||||
public String getModifyTime() {
|
||||
return this.modifyTime;
|
||||
}
|
||||
|
||||
public void setModifyTime(String modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
public String getModifyTime1() {
|
||||
return this.modifyTime1;
|
||||
}
|
||||
|
||||
public void setModifyTime1(String modifyTime1) {
|
||||
this.modifyTime1 = modifyTime1;
|
||||
}
|
||||
|
||||
public String getModifyTime2() {
|
||||
return this.modifyTime2;
|
||||
}
|
||||
|
||||
public void setModifyTime2(String modifyTime2) {
|
||||
this.modifyTime2 = modifyTime2;
|
||||
}
|
||||
|
||||
public String getModifyTimeOperator() {
|
||||
return this.modifyTimeOperator;
|
||||
}
|
||||
|
||||
public void setModifyTimeOperator(String modifyTimeOperator) {
|
||||
this.modifyTimeOperator = modifyTimeOperator;
|
||||
}
|
||||
|
||||
public String getCreationTime() {
|
||||
return this.creationTime;
|
||||
}
|
||||
|
||||
public void setCreationTime(String creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
public String getCreationTime1() {
|
||||
return this.creationTime1;
|
||||
}
|
||||
|
||||
public void setCreationTime1(String creationTime1) {
|
||||
this.creationTime1 = creationTime1;
|
||||
}
|
||||
|
||||
public String getCreationTime2() {
|
||||
return this.creationTime2;
|
||||
}
|
||||
|
||||
public void setCreationTime2(String creationTime2) {
|
||||
this.creationTime2 = creationTime2;
|
||||
}
|
||||
|
||||
public String getCreationTimeOperator() {
|
||||
return this.creationTimeOperator;
|
||||
}
|
||||
|
||||
public void setCreationTimeOperator(String creationTimeOperator) {
|
||||
this.creationTimeOperator = creationTimeOperator;
|
||||
}
|
||||
|
||||
public String getValidFlag() {
|
||||
return this.validFlag;
|
||||
}
|
||||
|
||||
public void setValidFlag(String validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
public String getValidFlagOperator() {
|
||||
return this.validFlagOperator;
|
||||
}
|
||||
|
||||
public void setValidFlagOperator(String validFlagOperator) {
|
||||
this.validFlagOperator = validFlagOperator;
|
||||
}
|
||||
|
||||
public String getAttId() {
|
||||
return this.attId;
|
||||
}
|
||||
|
||||
public void setAttId(String attId) {
|
||||
this.attId = attId;
|
||||
}
|
||||
|
||||
public String getAttIdOperator() {
|
||||
return this.attIdOperator;
|
||||
}
|
||||
|
||||
public void setAttIdOperator(String attIdOperator) {
|
||||
this.attIdOperator = attIdOperator;
|
||||
}
|
||||
|
||||
public String getFileSuffix() {
|
||||
return this.fileSuffix;
|
||||
}
|
||||
|
||||
public void setFileSuffix(String fileSuffix) {
|
||||
this.fileSuffix = fileSuffix;
|
||||
}
|
||||
|
||||
public String getFileSuffixOperator() {
|
||||
return this.fileSuffixOperator;
|
||||
}
|
||||
|
||||
public void setFileSuffixOperator(String fileSuffixOperator) {
|
||||
this.fileSuffixOperator = fileSuffixOperator;
|
||||
}
|
||||
|
||||
public String getFileName() {
|
||||
return this.fileName;
|
||||
}
|
||||
|
||||
public void setFileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
}
|
||||
|
||||
public String getFileNameOperator() {
|
||||
return this.fileNameOperator;
|
||||
}
|
||||
|
||||
public void setFileNameOperator(String fileNameOperator) {
|
||||
this.fileNameOperator = fileNameOperator;
|
||||
}
|
||||
|
||||
public String getMsgId() {
|
||||
return this.msgId;
|
||||
}
|
||||
|
||||
public void setMsgId(String msgId) {
|
||||
this.msgId = msgId;
|
||||
}
|
||||
|
||||
public String getMsgIdOperator() {
|
||||
return this.msgIdOperator;
|
||||
}
|
||||
|
||||
public void setMsgIdOperator(String msgIdOperator) {
|
||||
this.msgIdOperator = msgIdOperator;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getIdOperator() {
|
||||
return this.idOperator;
|
||||
}
|
||||
|
||||
public void setIdOperator(String idOperator) {
|
||||
this.idOperator = idOperator;
|
||||
}
|
||||
|
||||
|
||||
public String getFileType() {
|
||||
return fileType;
|
||||
}
|
||||
|
||||
public void setFileType(String fileType) {
|
||||
this.fileType = fileType;
|
||||
}
|
||||
|
||||
public String getFileTypeOperator() {
|
||||
return fileTypeOperator;
|
||||
}
|
||||
|
||||
public void setFileTypeOperator(String fileTypeOperator) {
|
||||
this.fileTypeOperator = fileTypeOperator;
|
||||
}
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.page;
|
||||
|
||||
import com.adc.da.sys.common.BasePage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 标准和法规联合查询
|
||||
*
|
||||
* @Author SYT
|
||||
* @CreateTime 2018/10/23 14:38
|
||||
* @attention
|
||||
*/
|
||||
public class SarStandAndLawsEOPage extends BasePage {
|
||||
|
||||
private String typeShow;
|
||||
private String showNumber;
|
||||
private String showName;
|
||||
|
||||
private List<String> menuRoleList;
|
||||
|
||||
private String standType;
|
||||
|
||||
|
||||
public String getTypeShow() {
|
||||
return typeShow;
|
||||
}
|
||||
|
||||
public void setTypeShow(String typeShow) {
|
||||
this.typeShow = typeShow;
|
||||
}
|
||||
|
||||
public String getShowNumber() {
|
||||
return showNumber;
|
||||
}
|
||||
|
||||
public void setShowNumber(String showNumber) {
|
||||
this.showNumber = showNumber;
|
||||
}
|
||||
|
||||
public String getShowName() {
|
||||
return showName;
|
||||
}
|
||||
|
||||
public void setShowName(String showName) {
|
||||
this.showName = showName;
|
||||
}
|
||||
|
||||
public List<String> getMenuRoleList() {
|
||||
return menuRoleList;
|
||||
}
|
||||
|
||||
public void setMenuRoleList(List<String> menuRoleList) {
|
||||
this.menuRoleList = menuRoleList;
|
||||
}
|
||||
|
||||
public String getStandType() {
|
||||
return standType;
|
||||
}
|
||||
|
||||
public void setStandType(String standType) {
|
||||
this.standType = standType;
|
||||
}
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.service;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.dto.MsgDynamicInfoExportDto;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgDynamicInfoEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgDynamicInfoEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.MsgDynamicInfoVO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.RecommendVO;
|
||||
import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
|
||||
import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage;
|
||||
import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEODao<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
|
||||
@Service
|
||||
public interface IMsgDynamicInfoEOService extends IService<MsgDynamicInfoEO> {
|
||||
|
||||
Integer updateIdOfMsgFile(List<MsgFileEO> msgFileEOS);
|
||||
|
||||
List<MsgDynamicInfoEO> queryByList (MsgDynamicInfoEOPage page);
|
||||
|
||||
public void updateMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO);
|
||||
|
||||
List<MsgDynamicInfoEO> queryByPage(MsgDynamicInfoEOPage page);
|
||||
|
||||
public void updateCollectAndShare(MsgDynamicInfoVO msgDynamicInfoVO);
|
||||
|
||||
public void deleteLogicInBatch(List<String> ids);
|
||||
|
||||
public void deleteCollectAndShare(String resId);
|
||||
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 根据id查询详细信息
|
||||
* Date 2018/10/10 11:23
|
||||
* @Param [id]
|
||||
* @return com.adc.da.lawss.entity.MsgDynamicInfoEO
|
||||
**/
|
||||
MsgDynamicInfoEO selectByMsgId(String id);
|
||||
|
||||
// liwenxuan:动态信息更新数量：国际动态INLAND
|
||||
Integer selectDynamicInfoUpdateNumINLAND(Date visitTime);
|
||||
// liwenxuan:动态信息更新数量：国际动态FOREIGN
|
||||
Integer selectDynamicInfoUpdateNumFOREIGN(Date visitTime);
|
||||
|
||||
// liwenxuan:动态信息更新数量：国际动态INLANDAll
|
||||
Integer selectDynamicInfoUpdateNumINLANDAll();
|
||||
// liwenxuan:动态信息更新数量：国际动态FOREIGNAll
|
||||
Integer selectDynamicInfoUpdateNumFOREIGNAll();
|
||||
|
||||
/**
|
||||
* 搜索中心查询相关推荐
|
||||
*
|
||||
* @param:
|
||||
* @auther: gaoyan
|
||||
* @date: 2018/11/10 9:22
|
||||
*/
|
||||
List<RecommendVO> selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew);
|
||||
|
||||
int updateByPrimaryKeySelective(MsgDynamicInfoEO msgDynamicInfoEO);
|
||||
|
||||
List<MsgDynamicInfoExportDto> getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page);
|
||||
|
||||
List<MsgDynamicInfoEO> showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO);
|
||||
|
||||
List<MsgDynamicInfoEO> queryAllByPage(MsgDynamicInfoEOPage msgDynamicInfoEO);
|
||||
|
||||
int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO);
|
||||
|
||||
public String saveMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO);
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.service;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgFileEOPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_FILE MsgFileEODao<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
|
||||
|
||||
public interface IMsgFileEOService extends IService<MsgFileEO> {
|
||||
|
||||
//修改动态信息附件表
|
||||
void updateByPrimaryKeySelective(List<MsgFileEO> msgFileEO);
|
||||
|
||||
/****
|
||||
* 批量删除 根据消息ID
|
||||
* @MethodName:deleteLogicInBatch
|
||||
* @author: zhangyanduan
|
||||
* @param:[ids]
|
||||
* @return:void
|
||||
* date: 2018/9/18 17:05
|
||||
*/
|
||||
public void deleteLogicInBatch(List<String> ids );
|
||||
|
||||
List<MsgFileEO> queryByList(MsgFileEOPage msgFileEOPage);
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.service;
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.SarStandAndLawsEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.SarStandAndLawsEOPage;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 标准和法规联合查询
|
||||
*
|
||||
* @Author SYT
|
||||
* @CreateTime 2018/10/23 14:30
|
||||
* @attention
|
||||
*/
|
||||
public interface ISarStandAndLawsEOService extends IService<SarStandAndLawsEO> {
|
||||
List<SarStandAndLawsEO> selectStandAndLawsInfo(SarStandAndLawsEOPage page);
|
||||
|
||||
Integer selectStandAndLawsInfoCount(SarStandAndLawsEOPage page);
|
||||
|
||||
List<SarStandAndLawsEO> selectStand(SarStandAndLawsEOPage page);
|
||||
Integer selectStandCount(SarStandAndLawsEOPage page);
|
||||
|
||||
|
||||
List<SarStandAndLawsEO> selectStandNameAndType(String showNumber);
|
||||
|
||||
List<SarStandAndLawsEO> queryByNameNumber(SarStandAndLawsEOPage page);
|
||||
|
||||
}
|
||||
+453
@@ -0,0 +1,453 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.service.Impl;
|
||||
|
||||
import com.adc.da.att.entity.AttFileEO;
|
||||
import com.adc.da.att.service.IAttFileEOService;
|
||||
import com.adc.da.person.entity.TsPersonCollect;
|
||||
import com.adc.da.slrs.msgDynamicInfo.dao.*;
|
||||
import com.adc.da.slrs.msgDynamicInfo.dto.MsgDynamicInfoExportDto;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.*;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgDynamicInfoEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgFileEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.service.IMsgDynamicInfoEOService;
|
||||
import com.adc.da.slrs.msgDynamicInfo.service.ISarStandAndLawsEOService;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.MsgDynamicInfoVO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.vo.RecommendVO;
|
||||
import com.adc.da.person.entity.PersonShareEO;
|
||||
import com.adc.da.person.page.PersonCollectEOPage;
|
||||
import com.adc.da.person.page.PersonShareEOPage;
|
||||
import com.adc.da.sys.constant.ValidFlagEnum;
|
||||
import com.adc.da.sys.util.LoginUserUtil;
|
||||
import com.adc.da.sys.util.UUIDUtils;
|
||||
import com.adc.da.util.utils.StringUtils;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.adc.da.person.dao.PersonCollectEODao;
|
||||
import com.adc.da.person.dao.PersonShareEODao;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_DYNAMIC_INFO MsgDynamicInfoEOService<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
@Service("msgDynamicInfoEOService")
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class MsgDynamicInfoEOServiceImpl extends ServiceImpl<MsgDynamicInfoEODao, MsgDynamicInfoEO> implements IMsgDynamicInfoEOService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(MsgDynamicInfoEOServiceImpl.class);
|
||||
|
||||
@Autowired
|
||||
private MsgDynamicInfoEODao dao;
|
||||
|
||||
@Autowired
|
||||
private MsgFileEODao msgFileEODao;
|
||||
|
||||
@Autowired
|
||||
private IAttFileEOService attFileEOService;
|
||||
|
||||
@Autowired
|
||||
private PersonCollectEODao personCollectEODao;
|
||||
//
|
||||
@Autowired
|
||||
private PersonShareEODao personShareEODao;
|
||||
//
|
||||
// @Autowired
|
||||
// private CreateStandMQService createStandMQService;
|
||||
|
||||
// @Autowired
|
||||
// private ISarStandAndLawsEOService ISarStandAndLawsEOService;
|
||||
|
||||
|
||||
@Value("${elas.flag}")
|
||||
private boolean elasflag;//文件存储路径
|
||||
|
||||
public MsgDynamicInfoEODao getDao() {
|
||||
return dao;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@Override
|
||||
public String saveMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO) {
|
||||
Date nowDate=new Date();
|
||||
String msgId= UUIDUtils.randomUUID20();
|
||||
String userId= LoginUserUtil.getUserId();
|
||||
MsgDynamicInfoEO msgDynamicInfoEO=new MsgDynamicInfoEO();
|
||||
msgDynamicInfoEO.setId(msgId);
|
||||
msgDynamicInfoEO.setSaveStatus(msgDynamicInfoVO.getSaveStatus());
|
||||
msgDynamicInfoEO.setCreationTime(nowDate);
|
||||
msgDynamicInfoEO.setModifyTime(nowDate);
|
||||
if (StringUtils.isNotBlank(msgDynamicInfoVO.getPubUser())) {
|
||||
msgDynamicInfoEO.setPubUser(msgDynamicInfoVO.getPubUser());
|
||||
} else {
|
||||
msgDynamicInfoEO.setPubUser(userId);
|
||||
}
|
||||
msgDynamicInfoEO.setSource(msgDynamicInfoVO.getSource());
|
||||
msgDynamicInfoEO.setContent(msgDynamicInfoVO.getContent());
|
||||
msgDynamicInfoEO.setContentText(msgDynamicInfoVO.getContentText());
|
||||
msgDynamicInfoEO.setIsPicMsg(msgDynamicInfoVO.getIsPicMsg());
|
||||
msgDynamicInfoEO.setLinkUri(msgDynamicInfoVO.getLinkUri());
|
||||
msgDynamicInfoEO.setMsgMode(msgDynamicInfoVO.getMsgMode());
|
||||
msgDynamicInfoEO.setMsgType(msgDynamicInfoVO.getMsgType());
|
||||
msgDynamicInfoEO.setPubOrg(msgDynamicInfoVO.getPubOrg());
|
||||
msgDynamicInfoEO.setReleventGroup(msgDynamicInfoVO.getReleventGroup());
|
||||
Date pubTime = msgDynamicInfoVO.getPubTime();
|
||||
if (pubTime != null) {
|
||||
Calendar cal1 = Calendar.getInstance();
|
||||
cal1.setTime(pubTime);
|
||||
// 将分钟、秒、毫秒域清零
|
||||
cal1.set(Calendar.HOUR_OF_DAY, 0);
|
||||
cal1.set(Calendar.MINUTE, 0);
|
||||
cal1.set(Calendar.SECOND, 0);
|
||||
cal1.set(Calendar.MILLISECOND, 0);
|
||||
pubTime = cal1.getTime();
|
||||
}
|
||||
if ("save".equals(msgDynamicInfoEO.getSaveStatus())) {
|
||||
msgDynamicInfoEO.setValidFlag(1);
|
||||
msgDynamicInfoEO.setPubTime(null);
|
||||
}else {
|
||||
msgDynamicInfoEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
|
||||
msgDynamicInfoEO.setPubTime(pubTime);
|
||||
}
|
||||
msgDynamicInfoEO.setTitle(msgDynamicInfoVO.getTitle());
|
||||
//复制在富文本编辑器中的表格，保存后缺少border
|
||||
if(StringUtils.isNotEmpty(msgDynamicInfoEO.getContent())){
|
||||
//查询是否有表格
|
||||
int index = msgDynamicInfoEO.getContent().indexOf("<table");
|
||||
if(index>-1){
|
||||
int borderIndex = msgDynamicInfoEO.getContent().indexOf("<table border=");
|
||||
if(borderIndex == -1){
|
||||
String newContent = msgDynamicInfoEO.getContent().replace("<table","<table border='1'");
|
||||
msgDynamicInfoEO.setContent(newContent);
|
||||
}
|
||||
}
|
||||
}
|
||||
dao.insert(msgDynamicInfoEO);
|
||||
// MsgDynamicInfoEO contentTextEO=new MsgDynamicInfoEO();
|
||||
// contentTextEO.setId(msgId);
|
||||
// contentTextEO.setContentText(msgDynamicInfoVO.getContentText());
|
||||
// dao.updateByPrimaryKeySelective(contentTextEO);
|
||||
// 上传文件不为空，进行文件上传
|
||||
List<MsgFileEO> msgFileEOList = msgDynamicInfoVO.getMsgFileEOList();
|
||||
if(msgFileEOList != null && !msgFileEOList.isEmpty()){
|
||||
for( MsgFileEO msgFileEO : msgFileEOList){
|
||||
msgFileEO.setId(UUIDUtils.randomUUID20());
|
||||
msgFileEO.setMsgId(msgId);
|
||||
msgFileEO.setCreationTime(nowDate);
|
||||
msgFileEO.setModifyTime(nowDate);
|
||||
msgFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
|
||||
msgFileEO.setFileType("FILE");
|
||||
msgFileEODao.insert(msgFileEO);
|
||||
}
|
||||
}
|
||||
|
||||
Integer picMsg = msgDynamicInfoVO.getIsPicMsg();
|
||||
if(picMsg !=null){
|
||||
// 此处将新闻图片写入数据库
|
||||
if(msgDynamicInfoVO.getIsPicMsg()== ValidFlagEnum.VALID_TRUE.getValue()){
|
||||
MsgFileEO picFile= msgDynamicInfoVO.getPicFileEO();
|
||||
picFile.setId(UUIDUtils.randomUUID20());
|
||||
picFile.setMsgId(msgId);
|
||||
picFile.setFileType("PIC");
|
||||
picFile.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
|
||||
picFile.setCreationTime(nowDate);
|
||||
picFile.setModifyTime(nowDate);
|
||||
msgFileEODao.insert(picFile);
|
||||
}
|
||||
}
|
||||
|
||||
// if(elasflag && !"save".equals(msgDynamicInfoEO.getSaveStatus())){
|
||||
// createStandMQService.sendMsgdyinfoMQ(msgDynamicInfoEO,"add");
|
||||
// }
|
||||
|
||||
return msgId;
|
||||
}
|
||||
//修改
|
||||
@Override
|
||||
public int updateByPrimaryKeySelective(MsgDynamicInfoEO msgDynamicInfoEO) {
|
||||
|
||||
msgDynamicInfoEO.setModifyTime(new Date());
|
||||
//updateByPrimaryKeySelective改成updateById（zyh）
|
||||
return dao.updateByPrimaryKeySelective(msgDynamicInfoEO);
|
||||
}
|
||||
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@Override
|
||||
public void updateMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO) {
|
||||
Date nowDate=new Date();
|
||||
MsgDynamicInfoEO msgDynamicInfoEO=new MsgDynamicInfoEO();
|
||||
msgDynamicInfoEO.setId(msgDynamicInfoVO.getId());
|
||||
msgDynamicInfoEO.setCreationTime(msgDynamicInfoVO.getCreationTime());
|
||||
msgDynamicInfoEO.setModifyTime(nowDate);
|
||||
msgDynamicInfoEO.setPubUser(msgDynamicInfoVO.getPubUser());
|
||||
msgDynamicInfoEO.setContent(msgDynamicInfoVO.getContent());
|
||||
// msgDynamicInfoEO.setContentText(msgDynamicInfoVO.getContentText());
|
||||
msgDynamicInfoEO.setIsPicMsg(msgDynamicInfoVO.getIsPicMsg());
|
||||
msgDynamicInfoEO.setLinkUri(msgDynamicInfoVO.getLinkUri());
|
||||
msgDynamicInfoEO.setMsgMode(msgDynamicInfoVO.getMsgMode());
|
||||
msgDynamicInfoEO.setMsgType(msgDynamicInfoVO.getMsgType());
|
||||
msgDynamicInfoEO.setPubOrg(msgDynamicInfoVO.getPubOrg());
|
||||
msgDynamicInfoEO.setTitle(msgDynamicInfoVO.getTitle());
|
||||
msgDynamicInfoEO.setSaveStatus(msgDynamicInfoVO.getSaveStatus());
|
||||
if ("save".equals(msgDynamicInfoEO.getSaveStatus())) {
|
||||
msgDynamicInfoEO.setValidFlag(1);
|
||||
msgDynamicInfoEO.setPubTime(null);
|
||||
}else {
|
||||
msgDynamicInfoEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
|
||||
msgDynamicInfoEO.setPubTime(msgDynamicInfoVO.getPubTime());
|
||||
}
|
||||
//复制在富文本编辑器中的表格，保存后缺少border
|
||||
if(StringUtils.isNotEmpty(msgDynamicInfoEO.getContent())){
|
||||
//查询是否有表格
|
||||
int index = msgDynamicInfoEO.getContent().indexOf("<table");
|
||||
if(index>-1){
|
||||
int borderIndex = msgDynamicInfoEO.getContent().indexOf("<table border=");
|
||||
if(borderIndex == -1){
|
||||
String newContent = msgDynamicInfoEO.getContent().replace("<table","<table border='1'");
|
||||
msgDynamicInfoEO.setContent(newContent);
|
||||
}
|
||||
}
|
||||
}
|
||||
//updateByPrimaryKeySelective改成updateById（zyh）
|
||||
dao.updateById(msgDynamicInfoEO);
|
||||
// MsgDynamicInfoEO contentTextEO=new MsgDynamicInfoEO();
|
||||
// contentTextEO.setId(msgDynamicInfoVO.getId());
|
||||
// contentTextEO.setContentText(msgDynamicInfoVO.getContentText());
|
||||
// dao.updateByPrimaryKeySelective(contentTextEO);
|
||||
//开始更新附件信息
|
||||
// 首先将附件表数据全部清空
|
||||
List<String> msgIds=new ArrayList<String>();
|
||||
msgIds.add(msgDynamicInfoVO.getId());
|
||||
msgFileEODao.deleteLogicInBatch(new ArrayList<String>(msgIds));
|
||||
//重新将文件添加到附件表中
|
||||
List<MsgFileEO> msgFileEOList = msgDynamicInfoVO.getMsgFileEOList();
|
||||
if(msgFileEOList != null && !msgFileEOList.isEmpty()){
|
||||
for( MsgFileEO msgFileEO : msgFileEOList){
|
||||
msgFileEO.setId(UUIDUtils.randomUUID20());
|
||||
msgFileEO.setMsgId(msgDynamicInfoVO.getId());
|
||||
msgFileEO.setCreationTime(nowDate);
|
||||
msgFileEO.setModifyTime(nowDate);
|
||||
msgFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue());
|
||||
msgFileEO.setFileType("FILE");
|
||||
msgFileEODao.insert(msgFileEO);
|
||||
}
|
||||
}
|
||||
// if(elasflag && !"save".equals(msgDynamicInfoEO.getSaveStatus())){
|
||||
// createStandMQService.sendMsgdyinfoMQ(msgDynamicInfoEO,"update");
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgDynamicInfoEO> queryByPage(MsgDynamicInfoEOPage page) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateCollectAndShare(MsgDynamicInfoVO msgDynamicInfoVO) {
|
||||
//修改收藏表中
|
||||
PersonCollectEOPage personCollectEOPage = new PersonCollectEOPage();
|
||||
personCollectEOPage.setValidFlag("0");
|
||||
personCollectEOPage.setCollectResId(msgDynamicInfoVO.getId());
|
||||
List<TsPersonCollect> listCollect = personCollectEODao.queryByList(personCollectEOPage);
|
||||
if (listCollect != null && listCollect.size() > 0) {
|
||||
for (TsPersonCollect getCollect : listCollect) {
|
||||
TsPersonCollect collectEO = new TsPersonCollect();
|
||||
collectEO.setId(getCollect.getId());
|
||||
collectEO.setCollectTitle(msgDynamicInfoVO.getTitle());
|
||||
personCollectEODao.updateById(collectEO);
|
||||
}
|
||||
}
|
||||
|
||||
// 修改分享表中
|
||||
PersonShareEOPage personShareEOPage = new PersonShareEOPage();
|
||||
personShareEOPage.setValidFlag("0");
|
||||
personShareEOPage.setResId(msgDynamicInfoVO.getId());
|
||||
List<PersonShareEO> shareList = personShareEODao.queryByList(personShareEOPage);
|
||||
if(shareList != null && shareList.size()>0){
|
||||
for(PersonShareEO getShare : shareList){
|
||||
PersonShareEO shareEO = new PersonShareEO();
|
||||
shareEO.setId(getShare.getId());
|
||||
shareEO.setResTitle(msgDynamicInfoVO.getTitle());
|
||||
personShareEODao.updateById(shareEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 调用附件存入动态信息id
|
||||
@Override
|
||||
public Integer updateIdOfMsgFile(List<MsgFileEO> msgFileEOS){
|
||||
return dao.updateIdOfMsgFile(msgFileEOS);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgDynamicInfoEO> queryByList(MsgDynamicInfoEOPage page) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogicInBatch(List<String> ids){
|
||||
dao.deleteLogicInBatch(ids);
|
||||
// 删除消息附件内容
|
||||
msgFileEODao.deleteLogicInBatch(ids);
|
||||
|
||||
//删除成功后，将索引中对应数据删除
|
||||
// if(ids != null && ids.size()>0){
|
||||
// for(String id : ids){
|
||||
// if(elasflag) {
|
||||
// StandLawsEO standLawsEO = new StandLawsEO();
|
||||
// standLawsEO.setId(id);
|
||||
// standLawsEO.setType("msgdyinfo");
|
||||
// sarStandAndLawsEOService.deleteFomrIndex(standLawsEO);
|
||||
// }
|
||||
// deleteCollectAndShare(id);
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 同步删除收藏分享
|
||||
* Date 2019/1/24 15:14
|
||||
* @Param [resId]
|
||||
* @return void
|
||||
**/
|
||||
@Override
|
||||
public void deleteCollectAndShare(String resId) {
|
||||
//删除收藏表中
|
||||
PersonCollectEOPage personCollectEOPage = new PersonCollectEOPage();
|
||||
personCollectEOPage.setValidFlag("0");
|
||||
personCollectEOPage.setCollectResId(resId);
|
||||
List<TsPersonCollect> listCollect = personCollectEODao.queryByList(personCollectEOPage);
|
||||
if (listCollect != null && listCollect.size() > 0) {
|
||||
for (TsPersonCollect getCollect : listCollect) {
|
||||
TsPersonCollect collectEO = new TsPersonCollect();
|
||||
collectEO.setId(getCollect.getId());
|
||||
collectEO.setValidFlag(1);
|
||||
personCollectEODao.updateById(collectEO);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除分享表中
|
||||
PersonShareEOPage personShareEOPage = new PersonShareEOPage();
|
||||
personShareEOPage.setValidFlag("0");
|
||||
personShareEOPage.setResId(resId);
|
||||
List<PersonShareEO> shareList = personShareEODao.queryByList(personShareEOPage);
|
||||
if(shareList != null && shareList.size()>0){
|
||||
for(PersonShareEO getShare : shareList){
|
||||
PersonShareEO shareEO = new PersonShareEO();
|
||||
shareEO.setId(getShare.getId());
|
||||
shareEO.setValidFlag(1);
|
||||
personShareEODao.updateById(shareEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @Author yangxuenan
|
||||
* @Description 根据id查询详细信息
|
||||
* Date 2018/10/10 11:25
|
||||
* @Param [id]
|
||||
* @return com.adc.da.lawss.entity.MsgDynamicInfoEO
|
||||
**/
|
||||
@Override
|
||||
public MsgDynamicInfoEO selectByMsgId(String id){
|
||||
MsgDynamicInfoEO msgDynamicInfoEO = dao.selectByMsgId(id);
|
||||
if(msgDynamicInfoEO != null){
|
||||
MsgFileEOPage msgFileEOPage = new MsgFileEOPage();
|
||||
msgFileEOPage.setMsgId(id);
|
||||
msgFileEOPage.setValidFlag("0");
|
||||
List<MsgFileEO> getList = msgFileEODao.queryByList(msgFileEOPage);
|
||||
List<MsgFileEO> getPicList = new ArrayList<>();
|
||||
List<MsgFileEO> getFileList = new ArrayList<>();
|
||||
if(getList != null){
|
||||
if(getList.size() > 0){
|
||||
for(MsgFileEO msg : getList){
|
||||
if(StringUtils.isNotEmpty(msg.getAttId())){
|
||||
AttFileEO attFile = attFileEOService.getFileInfo(msg.getAttId());
|
||||
msg.setFilePath(attFile.getFilePath());
|
||||
// TODO 此处有一个坑，在看MsgFileEO时请注意几个文件的名称参数的get/set方法
|
||||
msg.setFileName(attFile.getFileName());
|
||||
msg.setOriginFileName(attFile.getOldFileName());
|
||||
if("PIC".equals(msg.getFileType())){
|
||||
getPicList.add(msg);
|
||||
} else if ("FILE".equals(msg.getFileType())){
|
||||
getFileList.add(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
msgDynamicInfoEO.setGetPicList(getPicList);
|
||||
msgDynamicInfoEO.setGetFileList(getFileList);
|
||||
|
||||
}
|
||||
|
||||
return msgDynamicInfoEO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer selectDynamicInfoUpdateNumINLAND(Date visitTime) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer selectDynamicInfoUpdateNumFOREIGN(Date visitTime) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer selectDynamicInfoUpdateNumINLANDAll() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer selectDynamicInfoUpdateNumFOREIGNAll() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<RecommendVO> selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew){
|
||||
return dao.selectRecommendMsgDynamicInfo(pagenew);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgDynamicInfoExportDto> getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page) {
|
||||
List<MsgDynamicInfoExportDto> result = dao.getMsgDynamicInfoForExport(page);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgDynamicInfoEO> showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO){
|
||||
return dao.showDetailsByRole(msgDynamicInfoEO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgDynamicInfoEO> queryAllByPage(MsgDynamicInfoEOPage page) {
|
||||
Integer rowCount = dao.queryAllByCount(page);
|
||||
page.getPager().setRowCount(rowCount);
|
||||
return dao.queryAllByPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.service.Impl;
|
||||
|
||||
|
||||
import com.adc.da.slrs.msgDynamicInfo.dao.MsgFileEODao;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.adc.da.slrs.msgDynamicInfo.page.MsgFileEOPage;
|
||||
import com.adc.da.slrs.msgDynamicInfo.service.IMsgFileEOService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* <br>
|
||||
* <b>功能：</b>MSG_FILE MsgFileEOService<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
@Service("msgFileEOService")
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class MsgFileEOServiceImpl extends ServiceImpl<MsgFileEODao, MsgFileEO> implements IMsgFileEOService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(IMsgFileEOService.class);
|
||||
|
||||
@Autowired
|
||||
private MsgFileEODao dao;
|
||||
|
||||
public MsgFileEODao getDao() {
|
||||
return dao;
|
||||
}
|
||||
|
||||
// 更新消息附件表
|
||||
@Override
|
||||
public void updateByPrimaryKeySelective(List<MsgFileEO> msgFileEO) {
|
||||
//必须修改成List
|
||||
for ( MsgFileEO msgFileEO1:msgFileEO) {
|
||||
msgFileEO1.setModifyTime(new Date());
|
||||
dao.updateByPrimaryKeySelective(msgFileEO1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogicInBatch(List<String> ids) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MsgFileEO> queryByList(MsgFileEOPage msgFileEOPage) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,303 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.vo;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.adc.da.slrs.msgDynamicInfo.entity.MsgFileEO;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Administrator on 2018/9/13 19:29
|
||||
*/
|
||||
public class MsgDynamicInfoVO extends BaseEntity {
|
||||
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
private Integer validFlag;
|
||||
private String pubOrg;
|
||||
private String pubUser;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pubTime;
|
||||
private String linkUri;
|
||||
private String content;
|
||||
private String contentText;
|
||||
private String title;
|
||||
private String msgMode;
|
||||
private String msgType;
|
||||
private String id;
|
||||
private Integer isPicMsg;
|
||||
//新填字段
|
||||
// 文件ID
|
||||
private String attId;
|
||||
// 文件后缀（类型）
|
||||
private String fileSuffix;
|
||||
// 文件名称
|
||||
private String fileName;
|
||||
// 消息Id
|
||||
private String msgId;
|
||||
private String saveStatus;
|
||||
private String source;
|
||||
private List<MsgFileEO> msgFileEOList;
|
||||
private MsgFileEO picFileEO;
|
||||
private String releventGroup;//相关工作组
|
||||
|
||||
/**
|
||||
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modifyTime -> modify_time</li>
|
||||
* <li>creationTime -> creation_time</li>
|
||||
* <li>validFlag -> valid_flag</li>
|
||||
* <li>pubOrg -> pub_org</li>
|
||||
* <li>pubUser -> pub_user</li>
|
||||
* <li>pubTime -> pub_time</li>
|
||||
* <li>linkUri -> link_uri</li>
|
||||
* <li>content -> content</li>
|
||||
* <li>title -> title</li>
|
||||
* <li>msgMode -> msg_mode</li>
|
||||
* <li>msgType -> msg_type</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String fieldToColumn(String fieldName) {
|
||||
if (fieldName == null) return null;
|
||||
switch (fieldName) {
|
||||
case "modifyTime": return "modify_time";
|
||||
case "creationTime": return "creation_time";
|
||||
case "validFlag": return "valid_flag";
|
||||
case "pubOrg": return "pub_org";
|
||||
case "pubUser": return "pub_user";
|
||||
case "pubTime": return "pub_time";
|
||||
case "linkUri": return "link_uri";
|
||||
case "content": return "content";
|
||||
case "title": return "title";
|
||||
case "msgMode": return "msg_mode";
|
||||
case "msgType": return "msg_type";
|
||||
case "id": return "id";
|
||||
case "isPicMsg": return "is_pic_msg";
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
|
||||
* <p>字段列表：</p>
|
||||
* <li>modify_time -> modifyTime</li>
|
||||
* <li>creation_time -> creationTime</li>
|
||||
* <li>valid_flag -> validFlag</li>
|
||||
* <li>pub_org -> pubOrg</li>
|
||||
* <li>pub_user -> pubUser</li>
|
||||
* <li>pub_time -> pubTime</li>
|
||||
* <li>link_uri -> linkUri</li>
|
||||
* <li>content -> content</li>
|
||||
* <li>title -> title</li>
|
||||
* <li>msg_mode -> msgMode</li>
|
||||
* <li>msg_type -> msgType</li>
|
||||
* <li>id -> id</li>
|
||||
*/
|
||||
public static String columnToField(String columnName) {
|
||||
if (columnName == null) return null;
|
||||
switch (columnName) {
|
||||
case "modify_time": return "modifyTime";
|
||||
case "creation_time": return "creationTime";
|
||||
case "valid_flag": return "validFlag";
|
||||
case "pub_org": return "pubOrg";
|
||||
case "pub_user": return "pubUser";
|
||||
case "pub_time": return "pubTime";
|
||||
case "link_uri": return "linkUri";
|
||||
case "content": return "content";
|
||||
case "title": return "title";
|
||||
case "msg_mode": return "msgMode";
|
||||
case "msg_type": return "msgType";
|
||||
case "id": return "id";
|
||||
case "is_pic_msg": return "isPicMsg";
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public Date getModifyTime() {
|
||||
return modifyTime;
|
||||
}
|
||||
|
||||
public void setModifyTime(Date modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
public Date getCreationTime() {
|
||||
return creationTime;
|
||||
}
|
||||
|
||||
public void setCreationTime(Date creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
public Integer getValidFlag() {
|
||||
return validFlag;
|
||||
}
|
||||
|
||||
public void setValidFlag(Integer validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
public String getPubOrg() {
|
||||
return pubOrg;
|
||||
}
|
||||
|
||||
public void setPubOrg(String pubOrg) {
|
||||
this.pubOrg = pubOrg;
|
||||
}
|
||||
|
||||
public String getPubUser() {
|
||||
return pubUser;
|
||||
}
|
||||
|
||||
public void setPubUser(String pubUser) {
|
||||
this.pubUser = pubUser;
|
||||
}
|
||||
|
||||
public Date getPubTime() {
|
||||
return pubTime;
|
||||
}
|
||||
|
||||
public void setPubTime(Date pubTime) {
|
||||
this.pubTime = pubTime;
|
||||
}
|
||||
|
||||
public String getLinkUri() {
|
||||
return linkUri;
|
||||
}
|
||||
|
||||
public void setLinkUri(String linkUri) {
|
||||
this.linkUri = linkUri;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getMsgMode() {
|
||||
return msgMode;
|
||||
}
|
||||
|
||||
public void setMsgMode(String msgMode) {
|
||||
this.msgMode = msgMode;
|
||||
}
|
||||
|
||||
public String getMsgType() {
|
||||
return msgType;
|
||||
}
|
||||
|
||||
public void setMsgType(String msgType) {
|
||||
this.msgType = msgType;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getAttId() {
|
||||
return attId;
|
||||
}
|
||||
|
||||
public void setAttId(String attId) {
|
||||
this.attId = attId;
|
||||
}
|
||||
|
||||
public String getFileSuffix() {
|
||||
return fileSuffix;
|
||||
}
|
||||
|
||||
public void setFileSuffix(String fileSuffix) {
|
||||
this.fileSuffix = fileSuffix;
|
||||
}
|
||||
|
||||
public String getFileName() {
|
||||
return fileName;
|
||||
}
|
||||
|
||||
public void setFileName(String fileName) {
|
||||
this.fileName = fileName;
|
||||
}
|
||||
|
||||
public String getMsgId() {
|
||||
return msgId;
|
||||
}
|
||||
|
||||
public void setMsgId(String msgId) {
|
||||
this.msgId = msgId;
|
||||
}
|
||||
|
||||
public List<MsgFileEO> getMsgFileEOList() {
|
||||
return msgFileEOList;
|
||||
}
|
||||
|
||||
public void setMsgFileEOList(List<MsgFileEO> msgFileEOList) {
|
||||
this.msgFileEOList = msgFileEOList;
|
||||
}
|
||||
|
||||
public Integer getIsPicMsg() {
|
||||
return isPicMsg;
|
||||
}
|
||||
|
||||
public void setIsPicMsg(Integer isPicMsg) {
|
||||
this.isPicMsg = isPicMsg;
|
||||
}
|
||||
|
||||
public void setPicFileEO(MsgFileEO picFileEO) {
|
||||
this.picFileEO = picFileEO;
|
||||
}
|
||||
|
||||
public MsgFileEO getPicFileEO(){
|
||||
return this.picFileEO;
|
||||
}
|
||||
|
||||
public String getContentText() {
|
||||
return contentText;
|
||||
}
|
||||
|
||||
public void setContentText(String contentText) {
|
||||
this.contentText = contentText;
|
||||
}
|
||||
|
||||
public String getSaveStatus() {
|
||||
return saveStatus;
|
||||
}
|
||||
|
||||
public void setSaveStatus(String saveStatus) {
|
||||
this.saveStatus = saveStatus;
|
||||
}
|
||||
|
||||
public String getReleventGroup() {
|
||||
return releventGroup;
|
||||
}
|
||||
|
||||
public void setReleventGroup(String releventGroup) {
|
||||
this.releventGroup = releventGroup;
|
||||
}
|
||||
|
||||
public String getSource() {
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSource(String source) {
|
||||
this.source = source;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.adc.da.slrs.msgDynamicInfo.vo;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
|
||||
/**
|
||||
* Created by gaoayn on 2018/9/13 19:29
|
||||
* 用于搜索中心的推荐
|
||||
*/
|
||||
public class RecommendVO extends BaseEntity {
|
||||
|
||||
private String nameShow;
|
||||
private String numberShow;
|
||||
private String typeShow;
|
||||
private String id;
|
||||
private String module;
|
||||
|
||||
public String getNameShow() {
|
||||
return nameShow;
|
||||
}
|
||||
|
||||
public void setNameShow(String nameShow) {
|
||||
this.nameShow = nameShow;
|
||||
}
|
||||
|
||||
public String getNumberShow() {
|
||||
return numberShow;
|
||||
}
|
||||
|
||||
public void setNumberShow(String numberShow) {
|
||||
this.numberShow = numberShow;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getTypeShow() {
|
||||
return typeShow;
|
||||
}
|
||||
|
||||
public void setTypeShow(String typeShow) {
|
||||
this.typeShow = typeShow;
|
||||
}
|
||||
|
||||
public String getModule() {
|
||||
return module;
|
||||
}
|
||||
|
||||
public void setModule(String module) {
|
||||
this.module = module;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
//package com.adc.da.slrs.person.dao;
|
||||
//
|
||||
//import com.adc.da.person.page.PersonCollectEOPage;
|
||||
//import com.adc.da.slrs.person.entity.PersonCollectEO;
|
||||
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
//import org.apache.ibatis.annotations.Param;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// *
|
||||
// * <br>
|
||||
// * <b>功能：</b>TS_PERSON_COLLECT PersonCollectEODao<br>
|
||||
// * <b>作者：</b>code generator<br>
|
||||
// * <b>日期：</b> 2018-09-03 <br>
|
||||
// * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
// */
|
||||
//public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
|
||||
//
|
||||
//
|
||||
// public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page);
|
||||
//
|
||||
// int queryByPersonCollectPageCount(PersonCollectEOPage page);
|
||||
//
|
||||
// int deleteByIdList(@Param("idList") List<String> idList);
|
||||
//
|
||||
// List<PersonCollectEO> queryByList(PersonCollectEOPage personCollectEOPage);
|
||||
//
|
||||
// int deleteByResId(@Param("resId") String resId);
|
||||
//}
|
||||
@@ -0,0 +1,26 @@
|
||||
//package com.adc.da.slrs.person.dao;
|
||||
//
|
||||
//import com.adc.da.person.entity.PersonShareEO;
|
||||
//import com.adc.da.person.page.PersonShareEOPage;
|
||||
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
//import org.apache.ibatis.annotations.Param;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// *
|
||||
// * <br>
|
||||
// * <b>功能：</b>TS_PERSON_SHARE PersonShareEODao<br>
|
||||
// * <b>作者：</b>code generator<br>
|
||||
// * <b>日期：</b> 2018-09-03 <br>
|
||||
// * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
// */
|
||||
//public interface PersonShareEODao extends BaseMapper<PersonShareEO> {
|
||||
//
|
||||
// void deleteByIdList(@Param("idList") List<String> idList);
|
||||
//
|
||||
// int deleteByResId(@Param("resId") String resId);
|
||||
//
|
||||
// List<PersonShareEO> queryByList(PersonShareEOPage personShareEOPage);
|
||||
//
|
||||
//}
|
||||
@@ -0,0 +1,212 @@
|
||||
//package com.adc.da.slrs.person.entity;
|
||||
//
|
||||
//import com.adc.da.base.entity.BaseEntity;
|
||||
//import com.adc.da.person.entity.PersonNoteEO;
|
||||
//import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
//
|
||||
//import java.util.ArrayList;
|
||||
//import java.util.Date;
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * <b>功能：</b>TS_PERSON_COLLECT PersonCollectEOEntity<br>
|
||||
// * <b>作者：</b>code generator<br>
|
||||
// * <b>日期：</b> 2018-09-03 <br>
|
||||
// * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
// */
|
||||
//public class PersonCollectEO extends BaseEntity {
|
||||
//
|
||||
// //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
// private Date modifyTime;
|
||||
// //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
//
|
||||
// private Date creationTime;
|
||||
// private Integer validFlag;
|
||||
// private String collectResId;
|
||||
// private String collectInfoUri;
|
||||
// private String collectTitle;
|
||||
// private String collectType;
|
||||
// private String userId;
|
||||
// private String id;
|
||||
//
|
||||
// //追加字段
|
||||
// private List<PersonNoteEO> noteList = new ArrayList<>();
|
||||
//
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
|
||||
// * <p>字段列表：</p>
|
||||
// * <li>modifyTime -> modify_time</li>
|
||||
// * <li>creationTime -> creation_time</li>
|
||||
// * <li>validFlag -> valid_flag</li>
|
||||
// * <li>collectResId -> collect_res_id</li>
|
||||
// * <li>collectInfoUri -> collect_info_uri</li>
|
||||
// * <li>collectTitle -> collect_title</li>
|
||||
// * <li>collectType -> collect_type</li>
|
||||
// * <li>userId -> user_id</li>
|
||||
// * <li>id -> id</li>
|
||||
// */
|
||||
// public static String fieldToColumn(String fieldName) {
|
||||
// if (fieldName == null){ return null;}
|
||||
// switch (fieldName) {
|
||||
// case "modifyTime": return "modify_time";
|
||||
// case "creationTime": return "creation_time";
|
||||
// case "validFlag": return "valid_flag";
|
||||
// case "collectResId": return "collect_res_id";
|
||||
// case "collectInfoUri": return "collect_info_uri";
|
||||
// case "collectTitle": return "collect_title";
|
||||
// case "collectType": return "collect_type";
|
||||
// case "userId": return "user_id";
|
||||
// case "id": return "id";
|
||||
// case "noteContent": return "noteContent";
|
||||
// default: return null;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
|
||||
// * <p>字段列表：</p>
|
||||
// * <li>modify_time -> modifyTime</li>
|
||||
// * <li>creation_time -> creationTime</li>
|
||||
// * <li>valid_flag -> validFlag</li>
|
||||
// * <li>collect_res_id -> collectResId</li>
|
||||
// * <li>collect_info_uri -> collectInfoUri</li>
|
||||
// * <li>collect_title -> collectTitle</li>
|
||||
// * <li>collect_type -> collectType</li>
|
||||
// * <li>user_id -> userId</li>
|
||||
// * <li>id -> id</li>
|
||||
// */
|
||||
// public static String columnToField(String columnName) {
|
||||
// if (columnName == null){ return null;}
|
||||
// switch (columnName) {
|
||||
// case "modify_time": return "modifyTime";
|
||||
// case "creation_time": return "creationTime";
|
||||
// case "valid_flag": return "validFlag";
|
||||
// case "collect_res_id": return "collectResId";
|
||||
// case "collect_info_uri": return "collectInfoUri";
|
||||
// case "collect_title": return "collectTitle";
|
||||
// case "collect_type": return "collectType";
|
||||
// case "user_id": return "userId";
|
||||
// case "id": return "id";
|
||||
// case "noteContent": return "noteContent";
|
||||
// default: return null;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public Date getModifyTime() {
|
||||
// return this.modifyTime;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setModifyTime(Date modifyTime) {
|
||||
// this.modifyTime = modifyTime;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public Date getCreationTime() {
|
||||
// return this.creationTime;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setCreationTime(Date creationTime) {
|
||||
// this.creationTime = creationTime;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public Integer getValidFlag() {
|
||||
// return this.validFlag;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setValidFlag(Integer validFlag) {
|
||||
// this.validFlag = validFlag;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getCollectResId() {
|
||||
// return this.collectResId;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setCollectResId(String collectResId) {
|
||||
// this.collectResId = collectResId;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getCollectInfoUri() {
|
||||
// return this.collectInfoUri;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setCollectInfoUri(String collectInfoUri) {
|
||||
// this.collectInfoUri = collectInfoUri;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getCollectTitle() {
|
||||
// return this.collectTitle;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setCollectTitle(String collectTitle) {
|
||||
// this.collectTitle = collectTitle;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getCollectType() {
|
||||
// return this.collectType;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setCollectType(String collectType) {
|
||||
// this.collectType = collectType;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getUserId() {
|
||||
// return this.userId;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setUserId(String userId) {
|
||||
// this.userId = userId;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public String getId() {
|
||||
// return this.id;
|
||||
// }
|
||||
//
|
||||
// /** **/
|
||||
// public void setId(String id) {
|
||||
// this.id = id;
|
||||
// }
|
||||
//
|
||||
// public List<PersonNoteEO> getNoteList() {
|
||||
// return noteList;
|
||||
// }
|
||||
//
|
||||
// public void setNoteList(List<PersonNoteEO> noteList) {
|
||||
// this.noteList = noteList;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String toString() {
|
||||
// return "PersonCollectEO{" +
|
||||
// "modifyTime=" + modifyTime +
|
||||
// ", creationTime=" + creationTime +
|
||||
// ", validFlag=" + validFlag +
|
||||
// ", collectResId='" + collectResId + '\'' +
|
||||
// ", collectInfoUri='" + collectInfoUri + '\'' +
|
||||
// ", collectTitle='" + collectTitle + '\'' +
|
||||
// ", collectType='" + collectType + '\'' +
|
||||
// ", userId='" + userId + '\'' +
|
||||
// ", id='" + id + '\'' +
|
||||
// ", noteList=" + noteList +
|
||||
// '}';
|
||||
// }
|
||||
//}
|
||||
+6
@@ -66,4 +66,10 @@ public class SapMeetingController extends BaseController<SapMeeting> {
|
||||
public int addMeeting(@RequestBody SapMeeting sapMeeting){
|
||||
return sapMeetingService.addMeeting(sapMeeting);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "修改会议")
|
||||
@PostMapping("/updateMeeting")
|
||||
public boolean updateMeeting( SapMeeting sapMeeting){
|
||||
return sapMeetingService.updateById(sapMeeting);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,5 +45,7 @@ public class SapMeeting{
|
||||
|
||||
private String files;//附件 json
|
||||
|
||||
private String place;
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1
-4
@@ -14,17 +14,14 @@ public class SarFindDto {
|
||||
private int Size;
|
||||
private String id;
|
||||
private String standName;
|
||||
// private String standNumber;
|
||||
private String standEnName;
|
||||
private String typeApplicable;
|
||||
private String nylx;
|
||||
// private String putTime;
|
||||
// private String XCXSSRQGJ;
|
||||
// private String ZCCSSRQGJ;
|
||||
private String zrbm;
|
||||
private String sycpx;
|
||||
private String standSort;
|
||||
private String standType;
|
||||
private String standNumber;
|
||||
private String types;
|
||||
|
||||
}
|
||||
|
||||
+14
-12
@@ -60,18 +60,20 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
|
||||
/**
|
||||
*2021/9/13 摒弃使用清单实施日期,改用标准实施日期
|
||||
*/
|
||||
List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){
|
||||
lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
|
||||
}
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){
|
||||
lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
|
||||
}
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){
|
||||
lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq());
|
||||
}
|
||||
if ("INLAND".equals(lawsDto.getStandType()))lawsDto.setStandType("INLAND_STAND");
|
||||
if ("FOREIGN".equals(lawsDto.getStandType()))lawsDto.setStandType("FOREIGN_STAND");
|
||||
if("1".equals(sarFindDto.getTypes())) {
|
||||
List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) {
|
||||
lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
|
||||
}
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) {
|
||||
lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
|
||||
}
|
||||
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) {
|
||||
lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq());
|
||||
}
|
||||
if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND");
|
||||
if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND");
|
||||
}
|
||||
}
|
||||
//适用车型
|
||||
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
|
||||
|
||||
+36
-28
@@ -13,6 +13,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
|
||||
import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService;
|
||||
import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
|
||||
import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl;
|
||||
import com.adc.da.slrs.sarUser.entity.UpDTO;
|
||||
import com.adc.da.slrs.sarUser.service.ITsUserService;
|
||||
import com.adc.da.sys.service.IDicTypeEOService;
|
||||
import com.adc.da.util.UUIDUtils;
|
||||
@@ -103,7 +104,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
//就判断页面的值和数据库里的值是否相等
|
||||
for (int i = 0; i < sarLawsDetailedLists.size(); i++) {
|
||||
//判断数据库里的数据的车型类别字段是否为空
|
||||
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()){
|
||||
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()) {
|
||||
System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加");
|
||||
}
|
||||
//相等就不许添加
|
||||
@@ -190,7 +191,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
newListMethod(addDetailedDto);
|
||||
return "车型类别清单添加成功";
|
||||
//添加方法结束
|
||||
} else if (carAddFlag == false){
|
||||
} else if (carAddFlag == false) {
|
||||
//0表示添加成功，1表示添加失败
|
||||
return "车型类别清单添加失败";
|
||||
}
|
||||
@@ -260,7 +261,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
TimeDto dto = new TimeDto();
|
||||
dto.setStandId(id[a]);
|
||||
//putTiem即ssrq可能为空 ''
|
||||
if (putTime.length>0){
|
||||
if (putTime.length > 0) {
|
||||
if ("-".equals(putTime[a]) || null == putTime[a]) {
|
||||
dto.setSsrq(null);
|
||||
} else {
|
||||
@@ -301,7 +302,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
@Override
|
||||
public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
|
||||
String countryArea, String projectName,
|
||||
String detailedList, String detailedListName,String carType) {
|
||||
String detailedList, String detailedListName, String carType) {
|
||||
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
|
||||
if ("1".equals(sortKey)) {
|
||||
wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).
|
||||
@@ -335,7 +336,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
}
|
||||
}
|
||||
String completedString = "";
|
||||
if (builder.length()>0) {
|
||||
if (builder.length() > 0) {
|
||||
completedString = builder.delete(builder.length() - 1, builder.length()).toString();
|
||||
}
|
||||
list1.setCountryArea(completedString);
|
||||
@@ -348,11 +349,22 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
}
|
||||
}
|
||||
}
|
||||
/////asdfghjkl
|
||||
|
||||
|
||||
userIPage.setRecords(list);
|
||||
}
|
||||
List<String> names = new ArrayList<>();
|
||||
userIPage.getRecords().forEach(sarLawsDetailedList -> {
|
||||
names.add(sarLawsDetailedList.getUpdatePeople());
|
||||
});
|
||||
List<UpDTO> upDTOS = iTsUserService.selectNameById(names, "0");
|
||||
Map<String, String> stringMap = new HashMap<>();
|
||||
upDTOS.forEach(upDTO -> {
|
||||
stringMap.put(upDTO.getId(), upDTO.getValue());
|
||||
});
|
||||
userIPage.getRecords().forEach(sarLawsDetailedList -> {
|
||||
if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) {
|
||||
sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople()));
|
||||
}
|
||||
});
|
||||
System.out.println("总条数" + userIPage.getTotal());
|
||||
System.out.println("总页数" + userIPage.getPages());
|
||||
return userIPage;
|
||||
@@ -367,8 +379,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
|
||||
//list是数据库里根据id查出来的数据;detailedUpDto是页面传回来的数据
|
||||
SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId());
|
||||
System.out.println("数据库里存的当前数据"+list.getCountryArea());
|
||||
System.out.println("页面现在的数据"+detailedUpDto.getCountryArea());
|
||||
System.out.println("数据库里存的当前数据" + list.getCountryArea());
|
||||
System.out.println("页面现在的数据" + detailedUpDto.getCountryArea());
|
||||
|
||||
//国家/地区清单 多选是否可以添加的标识，true表示可以添加，false表示不许添加
|
||||
boolean multiEditFlag = true;
|
||||
@@ -389,10 +401,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
//就判断页面的值和数据库里的值是否相等
|
||||
for (int i = 0; i < sarLawsDetailedLists.size(); i++) {
|
||||
//判断数据库里的数据的车型类别字段是否为空
|
||||
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()){
|
||||
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()) {
|
||||
System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加");
|
||||
}
|
||||
else if (Objects.equals(detailedUpDto.getCarType(), list.getCarType())){
|
||||
} else if (Objects.equals(detailedUpDto.getCarType(), list.getCarType())) {
|
||||
System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交");
|
||||
}
|
||||
//相等就不许添加
|
||||
@@ -408,8 +419,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
//就先判断数据库里的数据的国家/地区字段是否为空
|
||||
if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCountryArea()) {
|
||||
System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加");
|
||||
}
|
||||
else if (Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea())){
|
||||
} else if (Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea())) {
|
||||
System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交");
|
||||
}
|
||||
//再判断页面字段长度是否与数据库里的长度一样，如果长度不一样，允许新增
|
||||
@@ -483,7 +493,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
updateListMethod(detailedUpDto);
|
||||
return "车型类别清单修改成功";
|
||||
//添加方法结束
|
||||
} else if (carEditFlag == false){
|
||||
} else if (carEditFlag == false) {
|
||||
//0表示添加成功，1表示添加失败
|
||||
return "车型类别清单修改失败";
|
||||
}
|
||||
@@ -503,7 +513,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void updateListMethod(DetailedUpDto detailedUpDto) {
|
||||
@@ -595,7 +604,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
|
||||
|
||||
//更新标准是否纳入认证清单
|
||||
sarStandardsInfoDao.updateISRELATEACCESSById("1",Arrays.asList(detailedUpDto.getInforlist().split(",")) );
|
||||
sarStandardsInfoDao.updateISRELATEACCESSById("1", Arrays.asList(detailedUpDto.getInforlist().split(",")));
|
||||
|
||||
}
|
||||
}
|
||||
@@ -612,10 +621,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
|
||||
|
||||
@Override
|
||||
public void standardToLaws(String countryArea,TimeDto timeDto) {
|
||||
public void standardToLaws(String countryArea, TimeDto timeDto) {
|
||||
|
||||
if (countryArea==null){
|
||||
countryArea="";
|
||||
if (countryArea == null) {
|
||||
countryArea = "";
|
||||
}
|
||||
|
||||
|
||||
@@ -627,39 +636,38 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
|
||||
//1.获取标准清单的"国家/地区"
|
||||
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
|
||||
wrapper.select("country_area","id");
|
||||
wrapper.select("country_area", "id");
|
||||
//查询清单中的国家地区和清单id
|
||||
List<SarLawsDetailedList> sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper);
|
||||
//2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理
|
||||
String[] split = countryArea.split(","); //拆分标准中的国家地区
|
||||
|
||||
|
||||
|
||||
//遍历清单 对比国家地区
|
||||
for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) {
|
||||
if (lawsDetailed.getCountryArea()==null){
|
||||
if (lawsDetailed.getCountryArea() == null) {
|
||||
continue;
|
||||
}
|
||||
String[] sarLawsCounties = lawsDetailed.getCountryArea().split(",");//拆分清单中的国家地区
|
||||
// 对比清单列表中的国家地区,是否一致
|
||||
Arrays.sort(split);
|
||||
Arrays.sort(sarLawsCounties);
|
||||
if ( Arrays.equals(split,sarLawsCounties)){
|
||||
if (Arrays.equals(split, sarLawsCounties)) {
|
||||
|
||||
//一致时插入表并关联detailedListId和standId
|
||||
ArrayList<TimeDto> timeDtos = new ArrayList<>();
|
||||
timeDtos.add(timeDto);
|
||||
|
||||
QueryWrapper<SarLawsAttrDetailedList> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("stand_id",timeDto.getStandId());
|
||||
queryWrapper.eq("stand_id", timeDto.getStandId());
|
||||
|
||||
|
||||
//如果目标清单中已存标准在则更新 懒得写更新(⓿_⓿) 直接删掉,再重新插入
|
||||
if (sarLawsAttrDetailedListDao.selectCount(queryWrapper)>0) {
|
||||
if (sarLawsAttrDetailedListDao.selectCount(queryWrapper) > 0) {
|
||||
sarLawsAttrDetailedListDao.delete(queryWrapper);
|
||||
}
|
||||
|
||||
sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(),timeDtos);
|
||||
sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+8
@@ -87,6 +87,14 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "分解单更新")
|
||||
@PutMapping("/updateSarItemAndInterpretation")
|
||||
public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){
|
||||
boolean rows = ServiceImpl.updateById(resolveListForm);
|
||||
|
||||
return Result.success(rows);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-17
@@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
|
||||
page.setPage(findStandDto.getPage());
|
||||
page.setPageSize(findStandDto.getSize());
|
||||
page.setUserId(null);
|
||||
List<SarStandardsInfo> pageInfo = null;
|
||||
// try {
|
||||
// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page);
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
List<String> standId = new ArrayList<>();
|
||||
// for (SarStandardsInfo standardsInfo : pageInfo){
|
||||
//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
|
||||
// standId.add(standardsInfo.getId());
|
||||
//// }
|
||||
// }
|
||||
List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
|
||||
|
||||
List<LawsDto> list=new ArrayList<>();
|
||||
// if (standId==null || standId.size()==0){
|
||||
// list = null;
|
||||
// }else {
|
||||
list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
|
||||
// }
|
||||
IPage<LawsDto> page1=new Page<>();
|
||||
page1.setRecords(list);
|
||||
page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size());
|
||||
|
||||
+5
-13
@@ -419,13 +419,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
||||
p.setEndTimes(s.getEndTimes());
|
||||
for (SarStandAttrInfo a:list2){
|
||||
if(s.getId().equals(a.getStandId())){
|
||||
// p.setCYCVPPSBM(a.getCycvppsbm());
|
||||
// p.setCYCVPPSCN(a.getCycvppscn());
|
||||
p.setSSRQ(a.getSsrq());
|
||||
p.setXCXSSRQ(a.getXcxssrq());
|
||||
p.setZCCSSRQ(a.getZccssrq());
|
||||
// p.setKCCVPPSBM(a.getKccvppsbm());
|
||||
// p.setKCCVPPSCN(a.getKccvppscn());
|
||||
p.setZRBM(a.getZrbm());
|
||||
}
|
||||
}
|
||||
@@ -480,7 +476,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
||||
String idmis=String.join(",",ids);
|
||||
System.out.println(idmis);
|
||||
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
|
||||
wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
|
||||
wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT");
|
||||
wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
|
||||
List<SarStandardsInfo> userList1 = SarStandardsInfoDao.selectList(wrapper1);
|
||||
QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
|
||||
@@ -516,24 +512,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
||||
}
|
||||
for(SarStandardsInfo s:userList1){
|
||||
StandAttrInfoDto p =new StandAttrInfoDto();
|
||||
p.setStandNumber(s.getStandNumber());
|
||||
p.setStandNumber(s.getStandSort()+" "+s.getStandNumber()+"-"+s.getStandYear());
|
||||
p.setStandName(s.getStandName());
|
||||
p.setStandEnName(s.getStandEnName());
|
||||
for (SarStandAttrInfo a:userList2){
|
||||
if(s.getId().equals(a.getStandId())){
|
||||
// p.setCYCVPPSBM(a.getCycvppsbm());
|
||||
// p.setCYCVPPSCN(a.getCycvppscn());
|
||||
if (a.getSsrq()!=null){
|
||||
p.setSSRQ(a.getSsrq().substring(0,10));
|
||||
p.setSSRQ(a.getSsrq());
|
||||
}
|
||||
if (a.getXcxssrq()!=null){
|
||||
p.setXCXSSRQ(a.getXcxssrq().substring(0,10));
|
||||
p.setXCXSSRQ(a.getXcxssrq());
|
||||
}
|
||||
if (a.getZccssrq()!=null){
|
||||
p.setZCCSSRQ(a.getZccssrq().substring(0,10));
|
||||
p.setZCCSSRQ(a.getZccssrq());
|
||||
}
|
||||
// p.setKCCVPPSBM(a.getKccvppsbm());
|
||||
// p.setKCCVPPSCN(a.getKccvppscn());
|
||||
p.setZRBM(a.getZrbm());
|
||||
}
|
||||
}
|
||||
|
||||
+34
-47
@@ -56,7 +56,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
|
||||
List<SarStandardsInfo> list1 = userIPage1.getRecords();
|
||||
|
||||
QueryWrapper<SarStandUnqualified> wrapper = new QueryWrapper<>();
|
||||
// wrapper1.like("stand_number",null);
|
||||
wrapper.select("STAND_SERIAL_NUMBER");
|
||||
Page<SarStandUnqualified> page = new Page<>();
|
||||
IPage<SarStandUnqualified> userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper);
|
||||
@@ -68,28 +67,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
|
||||
}
|
||||
}
|
||||
|
||||
// QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
|
||||
// if(sarStandUnqualifiedPage.getStandId()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
|
||||
// }
|
||||
// //仅查询未关闭的
|
||||
// sarStandUnqualifiedQueryWrapper.eq("close_state",1);
|
||||
// //根据 项目名称 进行查询
|
||||
// if(sarStandUnqualifiedPage.getProductName()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
|
||||
// }
|
||||
// //根据 责任部门 进行查询
|
||||
// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
|
||||
// }
|
||||
// //根据 标准号/标准名称 进行查询
|
||||
// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
|
||||
//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
|
||||
// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
|
||||
// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
|
||||
// }
|
||||
Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
|
||||
//判断前端是否提供页码和每页条数
|
||||
sarStandUnqualifiedPage.setCloseState(1);
|
||||
List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
|
||||
Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
|
||||
standUnqualifiedPage.setRecords(sarStandUnqualifieds);
|
||||
@@ -106,34 +86,41 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
|
||||
*/
|
||||
@Override
|
||||
public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
|
||||
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
|
||||
// QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
|
||||
|
||||
if(sarStandUnqualifiedPage.getStandId()!=null){
|
||||
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
|
||||
// if(sarStandUnqualifiedPage.getStandId()!=null){
|
||||
//// sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
|
||||
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
|
||||
}
|
||||
if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
|
||||
sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
|
||||
}
|
||||
if (sarStandUnqualifiedPage.getStandName()!=null){
|
||||
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
|
||||
}
|
||||
|
||||
//仅查询关闭的
|
||||
sarStandUnqualifiedQueryWrapper.eq("close_state",2);
|
||||
if(sarStandUnqualifiedPage.getProductName()!=null){
|
||||
sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
|
||||
}
|
||||
if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
|
||||
sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
|
||||
}
|
||||
Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
|
||||
//判断前端是否提供页码和每页条数
|
||||
if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
|
||||
standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
|
||||
}
|
||||
return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
|
||||
|
||||
// }
|
||||
// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
|
||||
// }
|
||||
// if (sarStandUnqualifiedPage.getStandName()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
|
||||
// }
|
||||
//
|
||||
// //仅查询关闭的
|
||||
// sarStandUnqualifiedQueryWrapper.eq("close_state",2);
|
||||
// if(sarStandUnqualifiedPage.getProductName()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
|
||||
// }
|
||||
// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
|
||||
// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
|
||||
// }
|
||||
// Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
|
||||
// //判断前端是否提供页码和每页条数
|
||||
// if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
|
||||
// standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
|
||||
// }
|
||||
sarStandUnqualifiedPage.setCloseState(2);
|
||||
List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
|
||||
Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
|
||||
Page page=new Page();
|
||||
page.setSize(sarStandUnqualifiedPage.getSize());
|
||||
page.setCurrent(sarStandUnqualifiedPage.getCurrent());
|
||||
page.setTotal(total);
|
||||
page.setRecords(sarStandUnqualifieds);
|
||||
return page;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+3
-3
@@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
tsUserQW.select("UNAME")
|
||||
.in("USID",valArr);
|
||||
List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
|
||||
value= String.join(",", stringList);
|
||||
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
|
||||
break;
|
||||
}
|
||||
//通过id绑定责任部门师名称
|
||||
@@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
tsPositionQW.select("name")
|
||||
.in("id",valArr);
|
||||
List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
|
||||
value = String.join(",", stringList);
|
||||
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
|
||||
break;
|
||||
}
|
||||
default:value = dicTypeEODao.getDicNamesByCodes(valArr);
|
||||
}
|
||||
|
||||
|
||||
entry.setValue(value);
|
||||
entry.setValue(value == null ? String.join(",",valArr) : value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -123,6 +123,8 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
|
||||
page.setFileSuffixList(suffix.split(","));
|
||||
}
|
||||
List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
|
||||
Integer count = sarStandFileEOService.getStandFileListByPageCount(page);
|
||||
page.getPager().setRowCount(count);
|
||||
for (SarStandFileEO one:rows) {
|
||||
one.setAttId(one.getAttId1());
|
||||
}
|
||||
|
||||
@@ -32,6 +32,8 @@ public interface SarStandFileEODao extends BaseMapper<SarStandFileEO> {
|
||||
|
||||
List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
|
||||
|
||||
Integer getStandFileListByPageCount(SarStandFileEOPage stand);
|
||||
|
||||
int queryStandFileListByCount(SarStandFileEOPage stand);
|
||||
|
||||
List<SarStandFileEO> queryByPage(SarStandFileEOPage page);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.adc.da.slrs.standardSplit.entity;
|
||||
|
||||
import com.adc.da.base.page.BasePage;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>SAR_STAND_FILE SarStandFileEOPage<br>
|
||||
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage;
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
@Data
|
||||
public class SarStandFileEOPage extends BasePage {
|
||||
|
||||
private String modifyTime;
|
||||
@@ -36,6 +38,7 @@ public class SarStandFileEOPage extends BasePage {
|
||||
private String standName;
|
||||
private String fileType;
|
||||
private String standFileClassify;
|
||||
private int rowCount;
|
||||
|
||||
public String getModifyTime() {
|
||||
return this.modifyTime;
|
||||
|
||||
+2
@@ -9,6 +9,8 @@ public interface SarStandFileEOService {
|
||||
|
||||
List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
|
||||
|
||||
Integer getStandFileListByPageCount(SarStandFileEOPage stand);
|
||||
|
||||
List<SarStandFileEO> queryByPage(SarStandFileEOPage page);
|
||||
|
||||
List<SarStandFileEO> queryByList(SarStandFileEOPage page);
|
||||
|
||||
+4
@@ -400,6 +400,10 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
|
||||
String imgUUIndex = "img" + String.valueOf(imgIndex);
|
||||
if (StringUtils.isNotEmpty(imgContent)){
|
||||
int pathIndex = imgContent.indexOf("src='file");
|
||||
if (pathIndex==-1){
|
||||
String sa = imgContent.replaceAll("\''","\'");
|
||||
pathIndex = sa.indexOf("src='file");
|
||||
}
|
||||
if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
|
||||
String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
|
||||
String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());
|
||||
|
||||
+5
@@ -37,6 +37,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
|
||||
return sarStandFileEODao.getStandFileListByPage(stand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getStandFileListByPageCount(SarStandFileEOPage stand){
|
||||
return sarStandFileEODao.getStandFileListByPageCount(stand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SarStandFileEO> queryByPage(SarStandFileEOPage page){
|
||||
return sarStandFileEODao.queryByPage(page);
|
||||
|
||||
Reference in New Issue
Block a user