diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/common/ReadExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/common/ReadExcel.java new file mode 100644 index 00000000..33447bba --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/common/ReadExcel.java @@ -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 ; + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/controller/MsgDynamicInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/controller/MsgDynamicInfoEOController.java new file mode 100644 index 00000000..3188d934 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/controller/MsgDynamicInfoEOController.java @@ -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{ + + 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> + **/ + @ApiOperation(value = "|MsgDynamicInfoEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("lawss:msgDynamicInfo:page") + public ResponseMessage> 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 rows = msgDynamicInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|MsgDynamicInfoEO|动态信息管理分页查询") + @GetMapping("/queryAllByPage") +// @RequiresPermissions("lawss:msgDynamicInfo:page") + public ResponseMessage> 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 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> + **/ + @ApiOperation(value = "|MsgDynamicInfoEO|查询") + @GetMapping("") +// @RequiresPermissions("lawss:msgDynamicInfo:list") + public ResponseMessage> list(MsgDynamicInfoEOPage page) throws Exception { + return Result.success(msgDynamicInfoEOService.queryByList(page)); + } + + @ApiOperation(value = "|MsgDynamicInfoEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("lawss:msgDynamicInfo:get") + public ResponseMessage 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 fileList= msgFileEOService.queryByList(fileEOPage); + if(fileList!=null && !fileList.isEmpty()){ + List fileEOS=new ArrayList(); + 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 msgFileEOList = new ArrayList<>(); + * 根据isPicMsg字段判断传入的是否为图片 private MsgFileEO picFileEO = new MsgFileEO(); + * @Date Administrator 2018/9/17 + * @Param [msgDynamicInfoVO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @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 + **/ + @ApiOperation(value = "|MsgDynamicInfoEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:msgDynamicInfo:update") + public ResponseMessage 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 + **/ + @ApiOperation(value = "|MsgDynamicInfoEO|根据id查询详细信息") + @GetMapping("/selectByMsgId") + public ResponseMessage 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> + **/ + @ApiOperation(value = "|MsgDynamicInfoEO|查询图片") + @GetMapping("/queryNewsPic") + // @RequiresPermissions("lawss:msgDynamicInfo:queryNewsPic") + public ResponseMessage> queryNewsPic(MsgDynamicInfoEOPage page) throws Exception { + page.setIsPicMsg(ValidFlagEnum.VALID_TRUE.getValue()+""); + page.setOrderBy("MSG_DYNAMIC_INFO.pub_time desc"); + List 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 paths = new ArrayList<>(); + for(int i=0;i> 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 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 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> showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO) throws Exception{ + // 根据当前登录人id查出对应角色 + String roleIds = UserUtils.getRoleIds(); + String[] roleArr = roleIds.split(","); + List roleIdList = Arrays.asList(roleArr); + msgDynamicInfoEO.setRoleIds(roleIdList); + List getMsg = msgDynamicInfoEOService.showDetailsByRole(msgDynamicInfoEO); + return Result.success(getMsg); + } + + @ApiOperation(value = "|MsgDynamicInfoEO|获取系统当前时间") + @GetMapping(value = "/getSystemTime") + public ResponseMessage getSystemTime() throws Exception{ + return Result.success(new Date()); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgDynamicInfoEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgDynamicInfoEODao.java new file mode 100644 index 00000000..7f9f9680 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgDynamicInfoEODao.java @@ -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; + +/** + * + *
+ * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEODao
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ + +@Repository +public interface MsgDynamicInfoEODao extends BaseMapper { + + Integer updateIdOfMsgFile(List msgFileEOS); + + + public void deleteLogicInBatch(List 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 selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew); + + + List getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page); + + List showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO); + + List queryAllByPage(MsgDynamicInfoEOPage msgDynamicInfoEO); + + int updateByPrimaryKeySelective(MsgDynamicInfoEO msgDynamicInfoEO); + + int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgFileEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgFileEODao.java new file mode 100644 index 00000000..03bbf693 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/MsgFileEODao.java @@ -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; + +/** + * + *
+ * 功能：MSG_FILE MsgFileEODao
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Repository +public interface MsgFileEODao extends BaseMapper { + +//修改动态信息附件表 + void updateByPrimaryKeySelective(MsgFileEO msgFileEO); + + /**** + * 批量删除 根据消息ID + * @MethodName:deleteLogicInBatch + * @author: zhangyanduan + * @param:[ids] + * @return:void + * date: 2018/9/18 17:05 + */ + public void deleteLogicInBatch(List ids ); + + List queryByList(MsgFileEOPage msgFileEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/SarStandAndLawsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/SarStandAndLawsEODao.java new file mode 100644 index 00000000..95ddf620 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dao/SarStandAndLawsEODao.java @@ -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 { + List selectStandAndLawsInfo(SarStandAndLawsEOPage page); + + Integer selectStandAndLawsInfoCount(SarStandAndLawsEOPage page); + + List selectStand(SarStandAndLawsEOPage page); + Integer selectStandCount(SarStandAndLawsEOPage page); + + + List selectStandNameAndType(String showNumber); + + List queryByNameNumber(SarStandAndLawsEOPage page); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dto/MsgDynamicInfoExportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dto/MsgDynamicInfoExportDto.java new file mode 100644 index 00000000..27648757 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/dto/MsgDynamicInfoExportDto.java @@ -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; + +/** + * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEOEntity
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgDynamicInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgDynamicInfoEO.java new file mode 100644 index 00000000..60a8d2df --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgDynamicInfoEO.java @@ -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; + +/** + * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEOEntity
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +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 attPath; + private Integer isPicMsg; + //记录上传的文件和图片 + private List getPicList; + private List getFileList; + //记录收藏id + private String collectId; + private String contentText; + private List 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字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • pubOrg -> pub_org
    • + *
  • pubUser -> pub_user
    • + *
  • pubTime -> pub_time
    • + *
  • linkUri -> link_uri
    • + *
  • content -> content
    • + *
  • title -> title
    • + *
  • msgMode -> msg_mode
    • + *
  • msgType -> msg_type
    • + *
  • id -> id
    • + */ + 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字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • pub_org -> pubOrg
    • + *
  • pub_user -> pubUser
    • + *
  • pub_time -> pubTime
    • + *
  • link_uri -> linkUri
    • + *
  • content -> content
    • + *
  • title -> title
    • + *
  • msg_mode -> msgMode
    • + *
  • msg_type -> msgType
    • + *
  • id -> id
    • + */ + 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 getGetPicList() { + return getPicList; + } + + public void setGetPicList(List getPicList) { + this.getPicList = getPicList; + } + + public List getGetFileList() { + return getFileList; + } + + public void setGetFileList(List 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 getAttPath() { + return attPath; + } + + public void setAttPath(List 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 getRoleIds() { + return roleIds; + } + + public void setRoleIds(List 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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgFileEO.java new file mode 100644 index 00000000..e7fd5ae4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/MsgFileEO.java @@ -0,0 +1,223 @@ +package com.adc.da.slrs.msgDynamicInfo.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：MSG_FILE MsgFileEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +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字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • attId -> att_id
    • + *
  • fileSuffix -> file_suffix
    • + *
  • fileName -> file_name
    • + *
  • msgId -> msg_id
    • + *
  • id -> id
    • + */ + 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字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • att_id -> attId
    • + *
  • file_suffix -> fileSuffix
    • + *
  • file_name -> fileName
    • + *
  • msg_id -> msgId
    • + *
  • id -> id
    • + */ + 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; + } +} + + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/SarStandAndLawsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/SarStandAndLawsEO.java new file mode 100644 index 00000000..bd3a1d58 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/entity/SarStandAndLawsEO.java @@ -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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgDynamicInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgDynamicInfoEOPage.java new file mode 100644 index 00000000..79f5a597 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgDynamicInfoEOPage.java @@ -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; + +/** + * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgFileEOPage.java new file mode 100644 index 00000000..61a4fbbe --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/MsgFileEOPage.java @@ -0,0 +1,213 @@ +package com.adc.da.slrs.msgDynamicInfo.page; + +import com.adc.da.sys.common.BasePage; + +/** + * 功能：MSG_FILE MsgFileEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/SarStandAndLawsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/SarStandAndLawsEOPage.java new file mode 100644 index 00000000..7c60c965 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/page/SarStandAndLawsEOPage.java @@ -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 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 getMenuRoleList() { + return menuRoleList; + } + + public void setMenuRoleList(List menuRoleList) { + this.menuRoleList = menuRoleList; + } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgDynamicInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgDynamicInfoEOService.java new file mode 100644 index 00000000..dc85ec9e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgDynamicInfoEOService.java @@ -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; + +/** + * + *
    + * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ + +@Service +public interface IMsgDynamicInfoEOService extends IService { + + Integer updateIdOfMsgFile(List msgFileEOS); + + List queryByList (MsgDynamicInfoEOPage page); + + public void updateMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO); + + List queryByPage(MsgDynamicInfoEOPage page); + + public void updateCollectAndShare(MsgDynamicInfoVO msgDynamicInfoVO); + + public void deleteLogicInBatch(List 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 selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew); + + int updateByPrimaryKeySelective(MsgDynamicInfoEO msgDynamicInfoEO); + + List getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page); + + List showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO); + + List queryAllByPage(MsgDynamicInfoEOPage msgDynamicInfoEO); + + int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO); + + public String saveMsgInfo(MsgDynamicInfoVO msgDynamicInfoVO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgFileEOService.java new file mode 100644 index 00000000..c4e2c581 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/IMsgFileEOService.java @@ -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; + +/** + * + *
    + * 功能：MSG_FILE MsgFileEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ + + +public interface IMsgFileEOService extends IService { + +//修改动态信息附件表 + void updateByPrimaryKeySelective(List msgFileEO); + + /**** + * 批量删除 根据消息ID + * @MethodName:deleteLogicInBatch + * @author: zhangyanduan + * @param:[ids] + * @return:void + * date: 2018/9/18 17:05 + */ + public void deleteLogicInBatch(List ids ); + + List queryByList(MsgFileEOPage msgFileEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/ISarStandAndLawsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/ISarStandAndLawsEOService.java new file mode 100644 index 00000000..6d310911 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/ISarStandAndLawsEOService.java @@ -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 { + List selectStandAndLawsInfo(SarStandAndLawsEOPage page); + + Integer selectStandAndLawsInfoCount(SarStandAndLawsEOPage page); + + List selectStand(SarStandAndLawsEOPage page); + Integer selectStandCount(SarStandAndLawsEOPage page); + + + List selectStandNameAndType(String showNumber); + + List queryByNameNumber(SarStandAndLawsEOPage page); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgDynamicInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgDynamicInfoEOServiceImpl.java new file mode 100644 index 00000000..a0c8054c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgDynamicInfoEOServiceImpl.java @@ -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; + + +/** + * + *
    + * 功能：MSG_DYNAMIC_INFO MsgDynamicInfoEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("msgDynamicInfoEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class MsgDynamicInfoEOServiceImpl extends ServiceImpl 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("-1){ + int borderIndex = msgDynamicInfoEO.getContent().indexOf(" 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("-1){ + int borderIndex = msgDynamicInfoEO.getContent().indexOf("
    msgIds=new ArrayList(); + msgIds.add(msgDynamicInfoVO.getId()); + msgFileEODao.deleteLogicInBatch(new ArrayList(msgIds)); + //重新将文件添加到附件表中 + List 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 queryByPage(MsgDynamicInfoEOPage page) { + return null; + } + + @Override + public void updateCollectAndShare(MsgDynamicInfoVO msgDynamicInfoVO) { + //修改收藏表中 + PersonCollectEOPage personCollectEOPage = new PersonCollectEOPage(); + personCollectEOPage.setValidFlag("0"); + personCollectEOPage.setCollectResId(msgDynamicInfoVO.getId()); + List 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 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 msgFileEOS){ + return dao.updateIdOfMsgFile(msgFileEOS); + } + + @Override + public List queryByList(MsgDynamicInfoEOPage page) { + return null; + } + + @Override + public void deleteLogicInBatch(List 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 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 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 getList = msgFileEODao.queryByList(msgFileEOPage); + List getPicList = new ArrayList<>(); + List 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 selectRecommendMsgDynamicInfo(MsgDynamicInfoEOPage pagenew){ + return dao.selectRecommendMsgDynamicInfo(pagenew); + } + + @Override + public List getMsgDynamicInfoForExport(MsgDynamicInfoEOPage page) { + List result = dao.getMsgDynamicInfoForExport(page); + return result; + } + + @Override + public List showDetailsByRole(MsgDynamicInfoEO msgDynamicInfoEO){ + return dao.showDetailsByRole(msgDynamicInfoEO); + } + + @Override + public List queryAllByPage(MsgDynamicInfoEOPage page) { + Integer rowCount = dao.queryAllByCount(page); + page.getPager().setRowCount(rowCount); + return dao.queryAllByPage(page); + } + + @Override + public int queryAllByCount(MsgDynamicInfoEOPage msgDynamicInfoEO) { + return 0; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgFileEOServiceImpl.java new file mode 100644 index 00000000..c9ecb302 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/service/Impl/MsgFileEOServiceImpl.java @@ -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; + + +/** + * + *
    + * 功能：MSG_FILE MsgFileEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("msgFileEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class MsgFileEOServiceImpl extends ServiceImpl 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) { +//必须修改成List + for ( MsgFileEO msgFileEO1:msgFileEO) { + msgFileEO1.setModifyTime(new Date()); + dao.updateByPrimaryKeySelective(msgFileEO1); + } + } + + @Override + public void deleteLogicInBatch(List ids) { + + } + + @Override + public List queryByList(MsgFileEOPage msgFileEOPage) { + return null; + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/MsgDynamicInfoVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/MsgDynamicInfoVO.java new file mode 100644 index 00000000..6933859d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/MsgDynamicInfoVO.java @@ -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 msgFileEOList; + private MsgFileEO picFileEO; + private String releventGroup;//相关工作组 + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • pubOrg -> pub_org
    • + *
  • pubUser -> pub_user
    • + *
  • pubTime -> pub_time
    • + *
  • linkUri -> link_uri
    • + *
  • content -> content
    • + *
  • title -> title
    • + *
  • msgMode -> msg_mode
    • + *
  • msgType -> msg_type
    • + *
  • id -> id
    • + */ + 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字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • pub_org -> pubOrg
    • + *
  • pub_user -> pubUser
    • + *
  • pub_time -> pubTime
    • + *
  • link_uri -> linkUri
    • + *
  • content -> content
    • + *
  • title -> title
    • + *
  • msg_mode -> msgMode
    • + *
  • msg_type -> msgType
    • + *
  • id -> id
    • + */ + 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 getMsgFileEOList() { + return msgFileEOList; + } + + public void setMsgFileEOList(List 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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/RecommendVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/RecommendVO.java new file mode 100644 index 00000000..36634bcc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/msgDynamicInfo/vo/RecommendVO.java @@ -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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonCollectEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonCollectEODao.java new file mode 100644 index 00000000..da953edb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonCollectEODao.java @@ -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; +// +///** +// * +// *
    +// * 功能：TS_PERSON_COLLECT PersonCollectEODao
    +// * 作者：code generator
    +// * 日期： 2018-09-03
    +// * 版权所有：版权归北京卡达克数据技术中心所有。
    +// */ +//public interface PersonCollectEODao extends BaseMapper { +// +// +// public List queryByPersonCollectPage(PersonCollectEOPage page); +// +// int queryByPersonCollectPageCount(PersonCollectEOPage page); +// +// int deleteByIdList(@Param("idList") List idList); +// +// List queryByList(PersonCollectEOPage personCollectEOPage); +// +// int deleteByResId(@Param("resId") String resId); +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonShareEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonShareEODao.java new file mode 100644 index 00000000..7b593404 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/dao/PersonShareEODao.java @@ -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; +// +///** +// * +// *
    +// * 功能：TS_PERSON_SHARE PersonShareEODao
    +// * 作者：code generator
    +// * 日期： 2018-09-03
    +// * 版权所有：版权归北京卡达克数据技术中心所有。
    +// */ +//public interface PersonShareEODao extends BaseMapper { +// +// void deleteByIdList(@Param("idList") List idList); +// +// int deleteByResId(@Param("resId") String resId); +// +// List queryByList(PersonShareEOPage personShareEOPage); +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/person/entity/PersonCollectEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/entity/PersonCollectEO.java new file mode 100644 index 00000000..3ad10f4c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/person/entity/PersonCollectEO.java @@ -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; +// +///** +// * 功能：TS_PERSON_COLLECT PersonCollectEOEntity
    +// * 作者：code generator
    +// * 日期： 2018-09-03
    +// * 版权所有：版权归北京卡达克数据技术中心所有。
    +// */ +//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 noteList = new ArrayList<>(); +// +// +// +// /** +// * java字段名转换为原始数据库列名。如果不存在则返回null
    +// *

    字段列表：

    +// *
  • modifyTime -> modify_time
    • +// *
  • creationTime -> creation_time
    • +// *
  • validFlag -> valid_flag
    • +// *
  • collectResId -> collect_res_id
    • +// *
  • collectInfoUri -> collect_info_uri
    • +// *
  • collectTitle -> collect_title
    • +// *
  • collectType -> collect_type
    • +// *
  • userId -> user_id
    • +// *
  • id -> id
    • +// */ +// 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字段名。如果不存在则返回null
    +// *

    字段列表：

    +// *
  • modify_time -> modifyTime
    • +// *
  • creation_time -> creationTime
    • +// *
  • valid_flag -> validFlag
    • +// *
  • collect_res_id -> collectResId
    • +// *
  • collect_info_uri -> collectInfoUri
    • +// *
  • collect_title -> collectTitle
    • +// *
  • collect_type -> collectType
    • +// *
  • user_id -> userId
    • +// *
  • id -> id
    • +// */ +// 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 getNoteList() { +// return noteList; +// } +// +// public void setNoteList(List 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 + +// '}'; +// } +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 0642b86c..60a9ddc3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -87,6 +87,14 @@ public class SarStandItemsController extends BaseController { return Result.success(pageInfo); } + @ApiOperation(value = "分解单更新") + @PutMapping("/updateSarItemAndInterpretation") + public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){ + boolean rows = ServiceImpl.updateById(resolveListForm); + + return Result.success(rows); + } + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgDynamicInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgDynamicInfoEOMapper.xml new file mode 100644 index 00000000..46fd4679 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgDynamicInfoEOMapper.xml @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + is_pic_msg,modify_time, creation_time, valid_flag, pub_org, pub_user, pub_time, link_uri, title, msg_mode, + msg_type, id, content,content_text,save_status,save_level,relevent_stand,relevent_laws,data_text, + relevent_group,source + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and pub_org ${pubOrgOperator} #{pubOrg} + + + and pub_user ${pubUserOperator} #{pubUser} + + + and pub_time ${pubTimeOperator} #{pubTime} + + + and pub_time >= #{pubTime1} + + + and pub_time <= #{pubTime2} + + + and link_uri ${linkUriOperator} #{linkUri} + + + and content ${contentOperator} #{content} + + + and title ${titleOperator} concat(concat('%',#{title}),'%') + + + and msg_mode ${msgModeOperator} #{msgMode} + + + and msg_type ${msgTypeOperator} #{msgType} + + + and (msg_type = 'INLAND' or msg_type = 'FOREIGN') + + + and id ${idOperator} #{id} + + + and is_pic_msg ${isPicMsgOperator} #{isPicMsg} + + + and save_level ${isPicMsgOperator} #{saveLevel} + + + and relevent_stand ${isPicMsgOperator} #{releventStand} + + + and relevent_laws ${isPicMsgOperator} #{releventLaws} + + + and data_text ${isPicMsgOperator} #{dataText} + + + and source = #{source} + + + + + + + + insert into MSG_DYNAMIC_INFO() + values (#{isPicMsg},#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{pubOrg, jdbcType=VARCHAR}, #{pubUser, jdbcType=VARCHAR}, #{pubTime, jdbcType=TIMESTAMP}, #{linkUri, jdbcType=VARCHAR},#{title, jdbcType=VARCHAR}, #{msgMode, jdbcType=VARCHAR}, #{msgType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR},#{content, jdbcType=VARCHAR},#{contentText,jdbcType=CLOB}) + + + + + insert into MSG_DYNAMIC_INFO + + is_pic_msg, + modify_time, + creation_time, + valid_flag, + pub_org, + pub_user, + pub_time, + link_uri, + content, + title, + msg_mode, + msg_type, + id, + content_text, + save_status, + save_level, + relevent_stand + relevent_laws, + relevent_group, + data_text, + source, + + + #{isPicMsg, jdbcType=INTEGER}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{pubOrg, jdbcType=VARCHAR}, + #{pubUser, jdbcType=VARCHAR}, + #{pubTime, jdbcType=TIMESTAMP}, + #{linkUri, jdbcType=VARCHAR}, + #{content, jdbcType=VARCHAR}, + #{title, jdbcType=VARCHAR}, + #{msgMode, jdbcType=VARCHAR}, + #{msgType, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{contentText,jdbcType=CLOB}, + #{saveStatus,jdbcType=VARCHAR}, + #{saveLevel,jdbcType=VARCHAR}, + #{releventStand,jdbcType=VARCHAR}, + #{releventLaws,jdbcType=VARCHAR}, + #{releventGroup,jdbcType=VARCHAR}, + #{dataText,jdbcType=VARCHAR}, + #{source,jdbcType=VARCHAR}, + + + + + + update MSG_DYNAMIC_INFO + set modify_time = #{modifyTime}, + is_pic_msg = #{isPicMsg}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + pub_org = #{pubOrg}, + pub_user = #{pubUser}, + pub_time = #{pubTime}, + link_uri = #{linkUri}, + content = #{content}, + content_text = #{contentText,jdbcType=CLOB}, + title = #{title}, + msg_mode = #{msgMode}, + msg_type = #{msgType} + where id = #{id} + + + + + update MSG_DYNAMIC_INFO + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + pub_org = #{pubOrg}, + + + pub_user = #{pubUser}, + + + pub_time = #{pubTime}, + + + link_uri = #{linkUri}, + + + content = #{content}, + + + title = #{title}, + + + msg_mode = #{msgMode}, + + + msg_type = #{msgType}, + + + is_pic_msg = #{isPicMsg}, + + + content_text = #{contentText,jdbcType=CLOB}, + + + save_status = #{saveStatus}, + + + save_level = #{saveLevel}, + + + relevent_stand = #{releventStand}, + + + relevent_laws = #{releventLaws}, + + + relevent_group = #{releventGroup}, + + + data_text = #{dataText}, + + + where id = #{id} + + + + + + + + + + UPDATE MSG_DYNAMIC_INFO + set valid_Flag = 1 + WHERE id = #{id} + + + + + + update MSG_DYNAMIC_INFO + set valid_flag = 1,save_status='delete' + where id in + + #{msgId} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgFileEOMapper.xml new file mode 100644 index 00000000..97c099d2 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/MsgFileEOMapper.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, att_id, file_suffix, file_name, msg_id, id,file_type + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and att_id ${attIdOperator} #{attId} + + + and file_suffix ${fileSuffixOperator} #{fileSuffix} + + + and file_name ${fileNameOperator} #{fileName} + + + and msg_id ${msgIdOperator} #{msgId} + + + and id ${idOperator} #{id} + + + and file_type ${fileTypeOperator} #{fileType} + + + + + + + + insert into MSG_FILE() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{attId, jdbcType=VARCHAR}, #{fileSuffix, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{msgId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR},#{fileType, jdbcType=VARCHAR}) + + + + + + insert into MSG_FILE + + modify_time, + creation_time, + valid_flag, + att_id, + file_suffix, + file_name, + msg_id, + id, + file_type, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{attId, jdbcType=VARCHAR}, + #{fileSuffix, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{msgId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR}, + + + + + + update MSG_FILE + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + att_id = #{attId}, + file_suffix = #{fileSuffix}, + file_name = #{fileName}, + msg_id = #{msgId}, + file_type = #{fileType} + where id = #{id} + + + + + update MSG_FILE + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + att_id = #{attId}, + + + file_suffix = #{fileSuffix}, + + + file_name = #{fileName}, + + + msg_id = #{msgId}, + + + file_type = #{fileType}, + + + + where msg_file.id in + + #{id} + + + + + + update MSG_FILE + set valid_flag = 1 + where msg_id in + + #{msgId} + + + + + + + + delete from MSG_FILE + where id = #{value} + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml new file mode 100644 index 00000000..5074bece --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml @@ -0,0 +1,532 @@ + + + + + + id,showNumber,country,showName,typeShow,standYear,issueTime,putTime,productPutTime,newproductPutTime,standStateShow,responsibleUnitId + ,responsibleUnitName,categoryShow,applyArcticShow,natureShow + + + + where 1=1 + + + and typeShow like concat(concat('%',#{typeShow}),'%') + + + and showNumber like concat(concat('%',#{showNumber}),'%') + + + and showName like concat(concat('%',#{showName}),'%') + + + + + + + + + + + + + + + + +