diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/column/BizBidNoticeField.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/column/BizBidNoticeField.java deleted file mode 100644 index 7265bf7..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/column/BizBidNoticeField.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.bizbidnotice.column; - -/** - * 字段常量 BizBidNotice - * - * @auto.generated - */ -public class BizBidNoticeField { - - - /** - * - */ - public static final String NOTICE_ID = "notice_id"; - - /** - * 标题 - */ - public static final String NOTICE_TITLE = "notice_title"; - - /** - * 内容 - */ - public static final String NOTICE_CONTENT = "notice_content"; - - /** - * 文件名 - */ - public static final String NOTICE_FILE_NAME = "notice_file_name"; - - /** - * 文件URL - */ - public static final String NOTICE_FILE_URL = "notice_file_url"; - - - - - - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java index 5d998f1..6253c4e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java @@ -1,206 +1,189 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; +import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNoticeVO; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.service.IBizBidNoticeService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; @RestController @Api(tags = "通知公告管理") @RequestMapping("/v1/bizbidnotice") public class BizBidNoticeController { - @Resource - private IBizBidNoticeService ibizBidNoticeService; + @Resource + private IBizBidNoticeService ibizBidNoticeService; - @Autowired - private IBaseCacheUserService iBaseCacheUserService; + @Autowired + private IBaseCacheUserService iBaseCacheUserService; - /** - * 查询发布数据 - * - * @param id - * - * @return - */ - @ApiOperation("查询发布列表") - @PostMapping("/list") - public BaseResponse> get(@RequestBody BizBidNotice bizBidNotice) { - if (bizBidNotice.getCurrent() == null || bizBidNotice.getPageSize() == null) { - return BaseResponse.fail("请传入分页功能所需参数，current,pageSize", null); - } - // 前端第一页默认传1而不是0 - if (bizBidNotice.getCurrent() == 1) { - bizBidNotice.setCurrent(0); - } - if("已发布".equals(bizBidNotice.getNoticeRelease())){ - bizBidNotice.setNoticeRelease("open"); - }else if("未发布".equals(bizBidNotice.getNoticeRelease())){ - bizBidNotice.setNoticeRelease("close"); - } - return BaseResponse.success(ibizBidNoticeService.getlist(bizBidNotice)); + /** + * 查询发布数据 + * + * @param bizBidNotice + * @return + */ + @ApiOperation("查询发布列表") + @PostMapping("/list") + public BasePageResponse get(@RequestBody BizBidNoticeVO bizBidNotice) { + if ("已发布".equals(bizBidNotice.getNoticeRelease())) { + bizBidNotice.setNoticeRelease("open"); + } else if ("未发布".equals(bizBidNotice.getNoticeRelease())) { + bizBidNotice.setNoticeRelease("close"); + } + return BasePageResponse.success(ibizBidNoticeService.getlist(bizBidNotice)); - } + } - /** - * 查询所有数据 - * - * @param id - * - * @return - */ - @ApiOperation("查询所有列表") - @PostMapping("/allList") - public BaseResponse> getAll(@RequestBody BizBidNotice bizBidNotice) { - if (bizBidNotice.getCurrent() == null || bizBidNotice.getPageSize() == null) { - return BaseResponse.fail("请传入分页功能所需参数，current,pageSize", null); - } - // 前端第一页默认传1而不是0 - if (bizBidNotice.getCurrent() == 1) { - bizBidNotice.setCurrent(0); - } - if("已发布".equals(bizBidNotice.getNoticeRelease())){ - bizBidNotice.setNoticeRelease("open"); - }else if("未发布".equals(bizBidNotice.getNoticeRelease())){ - bizBidNotice.setNoticeRelease("close"); - }else{ - bizBidNotice.setNoticeRelease(null); - } - return BaseResponse.success(ibizBidNoticeService.getAllList(bizBidNotice)); - } + /** + * 查询所有数据 + * + * @param bizBidNotice + * @return + */ + @ApiOperation("查询所有列表") + @PostMapping("/allList") + public BaseResponse> getAll(@RequestBody BizBidNoticeVO bizBidNotice) { - /** - * 插入新数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("插入新数据") - @PostMapping("/add") - public BaseResponse insert( - @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidNotice bizBidNotice) { - if (StringUtils.isBlank(bizBidNotice.getId())) { - bizBidNotice.setId(PropertyUtils.getSnowflakeId()); - } - bizBidNotice.setNoticeName(iBaseCacheUserService.getCacheUser().getFullName()); - return BaseResponse.success(ibizBidNoticeService.saveOrUpdate(bizBidNotice)); - } + if ("已发布".equals(bizBidNotice.getNoticeRelease())) { + bizBidNotice.setNoticeRelease("open"); + } else if ("未发布".equals(bizBidNotice.getNoticeRelease())) { + bizBidNotice.setNoticeRelease("close"); + } else { + bizBidNotice.setNoticeRelease(null); + } + return BaseResponse.success(ibizBidNoticeService.getAllList(bizBidNotice)); + } - /** - * 修改数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("修改数据") - @PostMapping("/update") - public BaseResponse update( - @ApiParam(value = "对象数据", required = true) @RequestBody BizBidNotice bizBidNotice) { - return BaseResponse.success(ibizBidNoticeService.updateById(bizBidNotice)); - } + /** + * 插入新数据 + * + * @param bizBidNotice + * @return + */ + @ApiOperation("插入新数据") + @PostMapping("/add") + public BaseResponse insert( + @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidNotice bizBidNotice) { + if (StringUtils.isBlank(bizBidNotice.getId())) { + bizBidNotice.setId(PropertyUtils.getSnowflakeId()); + } + bizBidNotice.setNoticeName(iBaseCacheUserService.getCacheUser().getFullName()); + return BaseResponse.success(ibizBidNoticeService.saveOrUpdate(bizBidNotice)); + } - - /** - * 发布数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("发布数据") - @PostMapping("/fabu/{id}") - public BaseResponse fabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - - return BaseResponse.success(ibizBidNoticeService.fabu(id)); - } - - /** - * 取消发布数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("发布数据") - @PostMapping("/qxfabu/{id}") - public BaseResponse qxfabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - - return BaseResponse.success(ibizBidNoticeService.qxfabu(id)); - } - - /** - * 置顶数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("置顶数据") - @PostMapping("/top/{id}") - public BaseResponse top(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - - return BaseResponse.success(ibizBidNoticeService.top(id)); - } - - /** - * 取消置顶数据 - * - * @param bizBidNotice - * - * @return - */ - @ApiOperation("取消置顶数据") - @PostMapping("/qxtop/{id}") - public BaseResponse qxtop(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - - return BaseResponse.success(ibizBidNoticeService.qxtop(id)); - } - - /** - * 查询数据 - * - * @param id - * - * @return - */ - @ApiOperation("查询数据") - @GetMapping("/select/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - return BaseResponse.success(ibizBidNoticeService.getById(id)); - } + /** + * 修改数据 + * + * @param bizBidNotice + * @return + */ + @ApiOperation("修改数据") + @PostMapping("/update") + public BaseResponse update( + @ApiParam(value = "对象数据", required = true) @RequestBody BizBidNotice bizBidNotice) { + return BaseResponse.success(ibizBidNoticeService.updateById(bizBidNotice)); + } - /** - * 删除数据 - * - * @param id - * - * @return - */ - @ApiOperation("删除数据") - @PostMapping("/delete/{id}") - public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - return BaseResponse.success(ibizBidNoticeService.deleteOff(id)); - } + + /** + * 发布数据 + * + * @param id + * @return + */ + @ApiOperation("发布数据") + @PostMapping("/fabu/{id}") + public BaseResponse fabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + BizBidNotice notice = new BizBidNotice(); + notice.setId(id) + .setNoticeRelease("open"); + return BaseResponse.success(ibizBidNoticeService.updateById(notice)); + } + + /** + * 取消发布数据 + * + * @param id + * @return + */ + @ApiOperation("发布数据") + @PostMapping("/qxfabu/{id}") + public BaseResponse qxfabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + + BizBidNotice notice = new BizBidNotice(); + notice.setId(id) + .setNoticeRelease("close"); + return BaseResponse.success(ibizBidNoticeService.updateById(notice)); + } + + /** + * 置顶数据 + * + * @param id + * @return + */ + @ApiOperation("置顶数据") + @PostMapping("/top/{id}") + public BaseResponse top(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + + + BizBidNotice notice = new BizBidNotice(); + notice.setId(id) + .setNoticeTop("0"); + return BaseResponse.success(ibizBidNoticeService.updateById(notice)); + } + + /** + * 取消置顶数据 + * + * @param id + * @return + */ + @ApiOperation("取消置顶数据") + @PostMapping("/qxtop/{id}") + public BaseResponse qxtop(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + + BizBidNotice notice = new BizBidNotice(); + notice.setId(id) + .setNoticeTop("1"); + return BaseResponse.success(ibizBidNoticeService.updateById(notice)); + } + + /** + * 查询数据 + * + * @param id + * @return + */ + @ApiOperation("查询数据") + @GetMapping("/select/{id}") + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + return BaseResponse.success(ibizBidNoticeService.getById(id)); + } + + /** + * 删除数据 + * + * @param id + * @return + */ + @ApiOperation("删除数据") + @PostMapping("/delete/{id}") + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + return BaseResponse.success(ibizBidNoticeService.removeById(id)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java index 0cb0f3b..7be1ea5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java @@ -10,15 +10,15 @@ import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; public interface BizBidNoticeMapper extends IBaseMapper { - public int deleteOff(String id); +// public int deleteOff(String id); - public List getList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease, @Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); +// public List getList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease, @Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - public List getListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); +// public List getListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - public List getAllList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); +// public List getAllList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - public List getAllListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); +// public List getAllListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); public Boolean fabu(@Param("id")String id); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml index 186091e..1690a6d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml @@ -26,49 +26,49 @@ create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_notice - + + + + + + + + + + + + + - + + + + + + + - + + + + + + + + + + + + + + + - + + + + + update biz_bid_notice diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java index 62d6b1f..e200bac 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java @@ -66,10 +66,6 @@ public class BizBidNotice extends BaseEntity implements Serializable { @ApiModelProperty(value = "是否置顶") private String noticeTop; - private Integer current; - - private Integer pageSize; - @ApiModelProperty("逻辑删除，normal表示正常（默认），deleted表示删除") @TableLogic private String deleteFlag; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java new file mode 100644 index 0000000..2257a87 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java @@ -0,0 +1,69 @@ +package com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 BizBidNotice + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class BizBidNoticeVO extends BasePageRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "ID") + private String id; + + /** + * + */ + @ApiModelProperty(value = "noticeName") + private String noticeName; + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String noticeTitle; + + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String noticeContent; + /** + * 文件ID + */ + @ApiModelProperty(value = "文件ID") + private String noticeFile; + /** + * 是否发布 + */ + @ApiModelProperty(value = "是否发布") + private String noticeRelease; + + /** + * 是否置顶 + */ + @ApiModelProperty(value = "是否置顶") + private String noticeTop; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java index 3f7c76e..fb43368 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java @@ -1,33 +1,21 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.service; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; +import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNoticeVO; /** * 对数据表 biz_bid_notice 操作的 service - * @author Auto create * + * @author Auto create */ -public interface IBizBidNoticeService extends IBaseService{ +public interface IBizBidNoticeService extends IBaseService { - public int deleteOff(String id); - public List getlist(BizBidNotice bizBidNotice); - - public List getListByTitle(BizBidNotice bizBidNotice); + public IPage getlist(BizBidNoticeVO bizBidNotice); - public List getAllList(BizBidNotice bizBidNotice); - public List getAllListByTitle(BizBidNotice bizBidNotice); - - public Boolean fabu(String id); - - public Boolean qxfabu(String id); - - public Boolean top(String id); - - public Boolean qxtop(String id); + public IPage getAllList(BizBidNoticeVO bizBidNotice); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java index 8aca901..2d05f10 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java @@ -1,88 +1,65 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.dao.BizBidNoticeMapper; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; +import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNoticeVO; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.service.IBizBidNoticeService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 对数据表 biz_bid_notice 操作的 serviceImpl - * - * @author Auto create * + * @author Auto create */ @Service -public class BizBidNoticeServiceImpl extends BaseServiceImpl - implements IBizBidNoticeService { - @Autowired - private BizBidNoticeMapper bizBidNoticeMapper; +public class BizBidNoticeServiceImpl extends BaseServiceImpl implements IBizBidNoticeService { - @Override - public int deleteOff(String id) { - return bizBidNoticeMapper.deleteOff(id); - } - public List listRelease(List list) { - for (BizBidNotice bizBidNotice2 : list) { - if ("open".equals(bizBidNotice2.getNoticeRelease())) { - bizBidNotice2.setNoticeRelease("已发布"); - } - if ("close".equals(bizBidNotice2.getNoticeRelease())) { - bizBidNotice2.setNoticeRelease("未发布"); - } - } - return list; - } + private void listRelease(List list) { + for (BizBidNotice bizBidNotice2 : list) { + if ("open".equals(bizBidNotice2.getNoticeRelease())) { + bizBidNotice2.setNoticeRelease("已发布"); + } + if ("close".equals(bizBidNotice2.getNoticeRelease())) { + bizBidNotice2.setNoticeRelease("未发布"); + } + } + } - @Override - public List getlist(BizBidNotice bizBidNotice) { - List list = bizBidNoticeMapper.getList(bizBidNotice.getNoticeTitle(),bizBidNotice.getNoticeName(),bizBidNotice.getCreateDate(),bizBidNotice.getNoticeRelease(),bizBidNotice.getCurrent(), bizBidNotice.getPageSize()); - return listRelease(list); - } + @Override + public IPage getlist(BizBidNoticeVO bizBidNotice) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(BizBidNotice::getNoticeRelease, "open") + .like(StrUtil.isNotEmpty(bizBidNotice.getNoticeTitle()), BizBidNotice::getNoticeTitle, bizBidNotice.getNoticeTitle()) + .like(StrUtil.isNotEmpty(bizBidNotice.getNoticeName()), BizBidNotice::getNoticeName, bizBidNotice.getNoticeName()) + .orderByAsc(BizBidNotice::getNoticeTop); - @Override - public List getListByTitle(BizBidNotice bizBidNotice) { - List list = bizBidNoticeMapper.getListByTitle(bizBidNotice.getNoticeTitle(), - bizBidNotice.getCurrent(), bizBidNotice.getPageSize()); - return listRelease(list); - } + IPage page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); + listRelease(page.getRecords()); + return page; + } - @Override - public List getAllList(BizBidNotice bizBidNotice) { - List list = bizBidNoticeMapper.getAllList(bizBidNotice.getNoticeTitle(),bizBidNotice.getNoticeName(),bizBidNotice.getCreateDate(),bizBidNotice.getNoticeRelease(),bizBidNotice.getCurrent(), bizBidNotice.getPageSize()); - return listRelease(list); - } - @Override - public List getAllListByTitle(BizBidNotice bizBidNotice) { - List list = bizBidNoticeMapper.getAllListByTitle(bizBidNotice.getNoticeTitle(), - bizBidNotice.getCurrent(), bizBidNotice.getPageSize()); - return listRelease(list); - } + @Override + public IPage getAllList(BizBidNoticeVO bizBidNotice) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotEmpty(bizBidNotice.getNoticeRelease()), BizBidNotice::getNoticeRelease, bizBidNotice.getNoticeRelease()) + .like(StrUtil.isNotEmpty(bizBidNotice.getNoticeTitle()), BizBidNotice::getNoticeTitle, bizBidNotice.getNoticeTitle()) + .like(StrUtil.isNotEmpty(bizBidNotice.getNoticeName()), BizBidNotice::getNoticeName, bizBidNotice.getNoticeName()) + .orderByAsc(BizBidNotice::getNoticeTop); - @Override - public Boolean fabu(String id) { - return bizBidNoticeMapper.fabu(id); - } - - @Override - public Boolean qxfabu(String id) { - return bizBidNoticeMapper.qxfabu(id); - } - - @Override - public Boolean top(String id) { - return bizBidNoticeMapper.top(id); - } - - @Override - public Boolean qxtop(String id) { - return bizBidNoticeMapper.qxtop(id); - } + IPage page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); + listRelease(page.getRecords()); + return page; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.java deleted file mode 100644 index e62f793..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/column/BizBidSharedField.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.bizbidshared.column; - -/** - * 字段常量 BizBidShared - * - * @auto.generated - */ -public class BizBidSharedField { - - - /** - * - */ - public static final String ID = "id"; - - /** - * - */ - public static final String SHARED_ID = "shared_id"; - - /** - * 鏍囬 - */ - public static final String SHARED_NAME = "shared_name"; - - /** - * 鍐呭 - */ - public static final String SHARED_ROLE = "shared_role"; - - /** - * 閺傚洣娆RL - */ - public static final String SHARED_FILE = "shared_file"; - - /** - * 闁哄嫷鍨伴幆渚€宕ｉ幋婵堫伌 - */ - public static final String SHARED_REMARKS = "shared_remarks"; - - - - - - - - - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java index 75c09f9..995d15c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java @@ -1,120 +1,95 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.controller; -import java.util.List; +import cn.hutool.core.util.StrUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import cn.hutool.core.util.StrUtil; -import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; -import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; - @RestController @Api(tags = "") @RequestMapping("/v1/bizbidshared") -public class BizBidSharedController{ - - @Resource - private IBizBidSharedService ibizBidSharedService; - - /** - * 查询数据列表 - * - * @param id - * - * @return - */ - @ApiOperation("查询数据列表") - @PostMapping("/list") - public BaseResponse> getList(@RequestBody BizBidShared bizBidShared){ - if (bizBidShared.getCurrent() == null || bizBidShared.getPageSize() == null) { - return BaseResponse.fail("请传入分页功能所需参数，current,pageSize", null); - } - // 前端第一页默认传1而不是0 - if (bizBidShared.getCurrent() == 1) { - bizBidShared.setCurrent(0); - } - return BaseResponse.success(ibizBidSharedService.getlist(bizBidShared)); - } - - /** - * 插入新数据 - * - * @param bizBidShared - * - * @return - */ - @ApiOperation("插入新数据") - @PostMapping("/add") - public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared){ - if (StringUtils.isEmpty(bizBidShared.getId())) { - bizBidShared.setId(PropertyUtils.getSnowflakeId()); - } - bizBidShared.setSharedRole(StrUtil.join(",", bizBidShared.getSharedRoles())); - boolean save = ibizBidSharedService.saveOrUpdate(bizBidShared); - - return BaseResponse.success(save); - } - - /** - * 修改数据 - * - * @param bizBidShared - * - * @return - */ - @ApiOperation("修改数据") - @PostMapping("") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody BizBidShared bizBidShared){ +public class BizBidSharedController { + + @Resource + private IBizBidSharedService ibizBidSharedService; + + /** + * 查询数据列表 + * + * @param bizBidShared + * @return + */ + @ApiOperation("查询数据列表") + @PostMapping("/list") + public BasePageResponse getList(@RequestBody BizBidSharedVO bizBidShared) { + return BasePageResponse.success(ibizBidSharedService.getList(bizBidShared)); + } + + /** + * 插入新数据 + * + * @param bizBidShared + * @return + */ + @ApiOperation("插入新数据") + @PostMapping("/add") + public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared) { + if (StringUtils.isEmpty(bizBidShared.getId())) { + bizBidShared.setId(PropertyUtils.getSnowflakeId()); + } + bizBidShared.setSharedRole(StrUtil.join(",", bizBidShared.getSharedRoles())); + boolean save = ibizBidSharedService.saveOrUpdate(bizBidShared); + + return BaseResponse.success(save); + } + + /** + * 修改数据 + * + * @param bizBidShared + * @return + */ + @ApiOperation("修改数据") + @PostMapping("") + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody BizBidShared bizBidShared) { + return BaseResponse.success(ibizBidSharedService.updateById(bizBidShared)); + } + + /** + * 查询数据 + * + * @param id + * @return + */ + @ApiOperation("查询数据") + @GetMapping("/{id}") + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + return BaseResponse.success(ibizBidSharedService.getById(id)); + } + + /** + * 删除数据 + * + * @param id + * @return + */ + @ApiOperation("删除数据") + @PostMapping("/delete/{id}") + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { + return BaseResponse.success(ibizBidSharedService.removeById(id)); + } - return BaseResponse.success(ibizBidSharedService.saveOrUpdate(bizBidShared)); - } - - /** - * 查询数据 - * - * @param id - * - * @return - */ - @ApiOperation("查询数据") - @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - - BizBidShared bizBidShared = ibizBidSharedService.getById(id); - - return BaseResponse.success(bizBidShared); - } - - /** - * 删除数据 - * - * @param id - * - * @return - */ - @ApiOperation("删除数据") - @PostMapping("/delete/{id}") - public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { - return BaseResponse.success(ibizBidSharedService.deleteOff(id)); - } - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java index 7bac004..ee886ec 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java @@ -1,21 +1,10 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.dao; -import java.time.LocalDateTime; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; public interface BizBidSharedMapper extends IBaseMapper { - List getListByTitle( @Param("sharedName")String sharedName, @Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - List getList(@Param("sharedName")String sharedName, @Param("sharedRole")String sharedRole,@Param("LocalDateTime") LocalDateTime localDateTime,@Param("pageIndex") Integer current,@Param("pageSize") Integer pageSize); - - int deleteOff(String id); - - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml index 3710820..66e1e3e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml @@ -4,45 +4,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - select id,shared_id, shared_name, shared_role, shared_file,shared_remarks, create_by, - create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_shared - - - - - + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java index f38ac8c..4463214 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java @@ -1,18 +1,16 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.entity; -import java.io.Serializable; -import java.util.List; - import com.baomidou.mybatisplus.annotation.*; -import org.springframework.data.annotation.Transient; - import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.List; /** * 实体类 BizBidShared @@ -25,57 +23,53 @@ import lombok.experimental.Accessors; @TableName(value = "biz_bid_shared", autoResultMap = true) public class BizBidShared extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * - */ - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.INPUT) - private String id; + /** + * + */ + @ApiModelProperty(value = "ID") + @TableId(value = "id", type = IdType.INPUT) + private String id; - /** - * - */ - @ApiModelProperty(value = "sharedId") - private String sharedId; + /** + * + */ + @ApiModelProperty(value = "sharedId") + private String sharedId; - /** - * 共享文档文件名 - */ - @ApiModelProperty(value = "共享文档文件名") - private String sharedName; + /** + * 共享文档文件名 + */ + @ApiModelProperty(value = "共享文档文件名") + private String sharedName; - /** - * 共享文档使用角色 - */ - @ApiModelProperty(value = "共享文档使用角色") - private String sharedRole; - /** - * 共享文档使用角色list - */ - - @Transient - @TableField(exist= false) - private List sharedRoles; - /** - * 共享文档ID - */ - @ApiModelProperty(value = "共享文档ID") - private String sharedFile; + /** + * 共享文档使用角色 + */ + @ApiModelProperty(value = "共享文档使用角色") + private String sharedRole; + /** + * 共享文档使用角色list + */ - /** - * 共享文档备注 - */ - @ApiModelProperty(value = "共享文档备注") - private String sharedRemarks; + @Transient + @TableField(exist = false) + private List sharedRoles; + /** + * 共享文档ID + */ + @ApiModelProperty(value = "共享文档ID") + private String sharedFile; - private Integer current; + /** + * 共享文档备注 + */ + @ApiModelProperty(value = "共享文档备注") + private String sharedRemarks; - private Integer pageSize; - - @TableLogic - @ApiModelProperty("逻辑删除，normal表示正常（默认），deleted表示删除") - private String deleteFlag; + @TableLogic + @ApiModelProperty("逻辑删除，normal表示正常（默认），deleted表示删除") + private String deleteFlag; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidSharedVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidSharedVO.java new file mode 100644 index 0000000..f1006a2 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidSharedVO.java @@ -0,0 +1,69 @@ +package com.chinaunicom.mall.ebtp.extend.bizbidshared.entity; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.List; + +/** + * 实体类 BizBidShared + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class BizBidSharedVO extends BasePageRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "ID") + private String id; + + /** + * + */ + @ApiModelProperty(value = "sharedId") + private String sharedId; + + /** + * 共享文档文件名 + */ + @ApiModelProperty(value = "共享文档文件名") + private String sharedName; + + /** + * 共享文档使用角色 + */ + @ApiModelProperty(value = "共享文档使用角色") + private String sharedRole; + /** + * 共享文档使用角色list + */ + + @Transient + @TableField(exist = false) + private List sharedRoles; + /** + * 共享文档ID + */ + @ApiModelProperty(value = "共享文档ID") + private String sharedFile; + + /** + * 共享文档备注 + */ + @ApiModelProperty(value = "共享文档备注") + private String sharedRemarks; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java index 01997a5..dc75352 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java @@ -1,21 +1,19 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.service; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; /** * 对数据表 biz_bid_shared 操作的 service - * @author Auto create * + * @author Auto create */ -public interface IBizBidSharedService extends IBaseService{ +public interface IBizBidSharedService extends IBaseService { - public int deleteOff(String id); - public List getlist(BizBidShared bizBidNotice); + public IPage getList(BizBidSharedVO bizBidNotice); - public List getListByTitle(BizBidShared bizBidNotice); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java index 3096908..2a0dde6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java @@ -1,39 +1,36 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.extend.bizbidshared.dao.BizBidSharedMapper; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; +import org.springframework.stereotype.Service; + /** * 对数据表 biz_bid_shared 操作的 serviceImpl - * @author Auto create * + * @author Auto create */ @Service -public class BizBidSharedServiceImpl extends BaseServiceImpl implements IBizBidSharedService { - @Autowired - BizBidSharedMapper bizBidSharedMapper; - @Autowired - AttachmentClient attachmentClient; - @Override - public int deleteOff(String id) { - return bizBidSharedMapper.deleteOff(id); - } - @Override - public List getlist(BizBidShared bizBidNotice) { - return bizBidSharedMapper.getList(bizBidNotice.getSharedName(),bizBidNotice.getSharedRole(),bizBidNotice.getCreateDate(),bizBidNotice.getCurrent(),bizBidNotice.getPageSize()); - } - - @Override - public List getListByTitle(BizBidShared bizBidNotice) { - return bizBidSharedMapper.getListByTitle(bizBidNotice.getSharedName(),bizBidNotice.getCurrent(),bizBidNotice.getPageSize()); - } +public class BizBidSharedServiceImpl extends BaseServiceImpl implements IBizBidSharedService { + + + @Override + public IPage getList(BizBidSharedVO bizBidNotice) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName()) + .like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole()); + + return this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/column/BizBidSharedRecordField.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/column/BizBidSharedRecordField.java deleted file mode 100644 index 5cec5bb..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/column/BizBidSharedRecordField.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.column; - -/** - * 字段常量 BizBidSharedRecord - * - * @auto.generated - */ -public class BizBidSharedRecordField { - - - /** - * - */ - public static final String ID = "id"; - - /** - * - */ - public static final String RECORD_ID = "record_id"; - - /** - * - */ - public static final String RECORD_ROLE = "record_role"; - - /** - * - */ - public static final String RECORD_NAME = "record_name"; - - /** - * - */ - public static final String RECORD_STAFF = "record_staff"; - - /** - * - */ - public static final String RECORD_ACCOUNT = "record_account"; - - - - - - - - - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java index 94316c9..0f3d726 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java @@ -1,86 +1,72 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; +import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.IBizBidSharedRecordService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; @RestController @Api(tags = "") @RequestMapping("/v1/bizbidsharedrecord") public class BizBidSharedRecordController { - @Resource - private IBizBidSharedRecordService ibizBidSharedRecordService; - @Autowired - private IBaseCacheUserService iBaseCacheUserService; + @Resource + private IBizBidSharedRecordService ibizBidSharedRecordService; - /** - * 查询数据列表 - * - * @param id - * - * @return - */ - @ApiOperation("查询数据列表") - @PostMapping("/list/{id}") - public BaseResponse> getList(@PathVariable("id") String id, - @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidSharedRecord bizBidShared) { - bizBidShared.setRecordId(id); - return BaseResponse.success(ibizBidSharedRecordService.getlist(bizBidShared)); - } + /** + * 查询数据列表 + * + * @param id + * @return + */ + @ApiOperation("查询数据列表") + @PostMapping("/list/{id}") + public BasePageResponse getList(@PathVariable("id") String id, + @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidSharedRecordVO bizBidShared) { + bizBidShared.setRecordId(id); + return BasePageResponse.success(ibizBidSharedRecordService.getList(bizBidShared)); + } - /** - * 插入新数据 - * - * @param bizBidSharedRecord - * - * @return - */ - @ApiOperation("插入新数据") - @PostMapping("/add") - public BaseResponse insert( - @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared) { - BizBidSharedRecord bizBidSharedRecord = new BizBidSharedRecord(); - bizBidSharedRecord.setId(null); - bizBidSharedRecord.setRecordId(bizBidShared.getId().toString()); - boolean save = ibizBidSharedRecordService.save(bizBidSharedRecord); + /** + * 插入新数据 + * + * @param bizBidShared + * @return + */ + @ApiOperation("插入新数据") + @PostMapping("/add") + public BaseResponse insert( + @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared) { + BizBidSharedRecord bizBidSharedRecord = new BizBidSharedRecord(); + bizBidSharedRecord.setId(PropertyUtils.getSnowflakeId()); + bizBidSharedRecord.setRecordId(bizBidShared.getId()); + boolean save = ibizBidSharedRecordService.save(bizBidSharedRecord); - return BaseResponse.success(save); - } + return BaseResponse.success(save); + } - /** - * 修改数据 - * - * @param bizBidSharedRecord - * - * @return - */ - @ApiOperation("修改数据") - @PutMapping("") - public BaseResponse update( - @ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord) { + /** + * 修改数据 + * + * @param bizBidSharedRecord + * @return + */ + @ApiOperation("修改数据") + @PutMapping("") + public BaseResponse update( + @ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord) { - return BaseResponse.success(ibizBidSharedRecordService.saveOrUpdate(bizBidSharedRecord)); - } + return BaseResponse.success(ibizBidSharedRecordService.updateById(bizBidSharedRecord)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/BizBidSharedRecordMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/BizBidSharedRecordMapper.java index ed2a1b1..580deac 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/BizBidSharedRecordMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/BizBidSharedRecordMapper.java @@ -1,16 +1,12 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.dao; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; public interface BizBidSharedRecordMapper extends IBaseMapper { - List getlist(BizBidSharedRecord bizBidSharedRecord); +// List getlist(BizBidSharedRecord bizBidSharedRecord); - BizBidSharedRecord getByIdInfo(@Param("recordId")String id,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); +// BizBidSharedRecord getByIdInfo(@Param("recordId")String id,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml index a7c42e2..8af6521 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml @@ -4,56 +4,56 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - select id,record_id, record_role, record_name, record_staff,record_account, create_by, - create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_shared_record - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java index ea4fa88..21d34d9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java @@ -1,18 +1,16 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity; -import java.io.Serializable; -import java.util.List; - -import org.springframework.data.annotation.Transient; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.List; /** * 实体类 BizBidSharedRecord @@ -25,143 +23,52 @@ import lombok.experimental.Accessors; @TableName(value = "biz_bid_shared_record", autoResultMap = true) public class BizBidSharedRecord extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * - */ - @ApiModelProperty(value = "ID") - private String id; + private static final long serialVersionUID = 1L; - /** - * - */ - @ApiModelProperty(value = "recordId") - private String recordId; - - /** - * - */ - - @Transient - @TableField(exist= false) - private List recordRoles; - - /** - * - */ - @ApiModelProperty(value = "使用角色") - - private String recordRole; - - /** - * - */ - @ApiModelProperty(value = "机构名称") - private String recordName; - - /** - * - */ - @ApiModelProperty(value = "下载人") - private String recordStaff; - - /** - * - */ - @ApiModelProperty(value = "下载账号") - private String recordAccount; - - private Integer current; - - private Integer pageSize; - - - - public Integer getCurrent() { - return current; - } - - public void setCurrent(Integer current) { - this.current = current; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - public void setRecordRole(String recordRole) { - this.recordRole = recordRole; - } - - public List getRecordRoles() { - return recordRoles; - } - - public void setRecordRoles(List recordRoles) { - this.recordRoles = recordRoles; - } - - public String getRecordRole() { - return recordRole; - } - - public String getRecordName() { - return recordName; - } - - public void setRecordName(String recordName) { - this.recordName = recordName; - } - - public String getRecordStaff() { - return recordStaff; - } - - public void setRecordStaff(String recordStaff) { - this.recordStaff = recordStaff; - } - - public String getRecordAccount() { - return recordAccount; - } - - public void setRecordAccount(String recordAccount) { - this.recordAccount = recordAccount; - } - - - public static long getSerialversionuid() { - return serialVersionUID; - } + /** + * + */ + @ApiModelProperty(value = "ID") + private String id; + /** + * + */ + @ApiModelProperty(value = "recordId") + private String recordId; + /** + * + */ + @Transient + @TableField(exist = false) + private List recordRoles; + /** + * + */ + @ApiModelProperty(value = "使用角色") + private String recordRole; + /** + * + */ + @ApiModelProperty(value = "机构名称") + private String recordName; + /** + * + */ + @ApiModelProperty(value = "下载人") + private String recordStaff; + /** + * + */ + @ApiModelProperty(value = "下载账号") + private String recordAccount; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java new file mode 100644 index 0000000..35cee5d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java @@ -0,0 +1,75 @@ +package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.List; + +/** + * 实体类 BizBidSharedRecord + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class BizBidSharedRecordVO extends BasePageRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty(value = "ID") + private String id; + + /** + * + */ + @ApiModelProperty(value = "recordId") + private String recordId; + + /** + * + */ + + @Transient + @TableField(exist = false) + private List recordRoles; + + /** + * + */ + @ApiModelProperty(value = "使用角色") + + private String recordRole; + + /** + * + */ + @ApiModelProperty(value = "机构名称") + private String recordName; + + /** + * + */ + @ApiModelProperty(value = "下载人") + private String recordStaff; + + /** + * + */ + @ApiModelProperty(value = "下载账号") + private String recordAccount; + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/IBizBidSharedRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/IBizBidSharedRecordService.java index 57adde9..3604b20 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/IBizBidSharedRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/IBizBidSharedRecordService.java @@ -1,22 +1,21 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; +import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; /** * 对数据表 biz_bid_shared_record 操作的 service - * @author Auto create * + * @author Auto create */ -public interface IBizBidSharedRecordService extends IBaseService{ +public interface IBizBidSharedRecordService extends IBaseService { - public List getlist(BizBidSharedRecord bizBidSharedRecord); - - public BizBidSharedRecord getByIdInfo(BizBidSharedRecord bizBidSharedRecord); + public IPage getList(BizBidSharedRecordVO bizBidSharedRecord); +// public BizBidSharedRecord getByIdInfo(BizBidSharedRecord bizBidSharedRecord); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java index ef97cbe..ecfcdee 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java @@ -1,33 +1,48 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.dao.BizBidSharedRecordMapper; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; +import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.IBizBidSharedRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + /** * 对数据表 biz_bid_shared_record 操作的 serviceImpl - * @author Auto create * + * @author Auto create */ @Service -public class BizBidSharedRecordServiceImpl extends BaseServiceImpl implements IBizBidSharedRecordService { +public class BizBidSharedRecordServiceImpl extends BaseServiceImpl implements IBizBidSharedRecordService { - @Autowired - BizBidSharedRecordMapper bizBidSharedRecordMapper; - @Override - public List getlist(BizBidSharedRecord bizBidSharedRecord) { - return bizBidSharedRecordMapper.getlist(bizBidSharedRecord); - } - @Override - public BizBidSharedRecord getByIdInfo(BizBidSharedRecord bizBidSharedRecord) { - return bizBidSharedRecordMapper.getByIdInfo(bizBidSharedRecord.getRecordId(),bizBidSharedRecord.getCurrent(),bizBidSharedRecord.getPageSize()); - } + @Autowired + BizBidSharedRecordMapper bizBidSharedRecordMapper; + + @Override + public IPage getList(BizBidSharedRecordVO recordVO) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + wrapper.eq(StrUtil.isNotEmpty(recordVO.getRecordId()), BizBidSharedRecord::getRecordId, recordVO.getRecordId()) + .like(StrUtil.isNotEmpty(recordVO.getRecordRole()), BizBidSharedRecord::getRecordRole, recordVO.getRecordRole()) + .eq(StrUtil.isNotEmpty(recordVO.getRecordName()), BizBidSharedRecord::getRecordName, recordVO.getRecordName()) + .eq(StrUtil.isNotEmpty(recordVO.getRecordStaff()), BizBidSharedRecord::getRecordStaff, recordVO.getRecordStaff()) + .eq(StrUtil.isNotEmpty(recordVO.getRecordAccount()), BizBidSharedRecord::getRecordAccount, recordVO.getRecordAccount()); + + return this.page(new Page<>(recordVO.getPageNo(), recordVO.getPageSize()), wrapper); + } + +// @Override +// public BizBidSharedRecord getByIdInfo(BizBidSharedRecord bizBidSharedRecord) { +// return bizBidSharedRecordMapper.getByIdInfo(bizBidSharedRecord.getRecordId(), bizBidSharedRecord.getCurrent(), bizBidSharedRecord.getPageSize()); +// } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java index 8ef5000..dfe774d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java @@ -24,8 +24,6 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalInfo对象", description="评标主表") -@TableName(value = "biz_rsms_bid_eval_info",autoResultMap = true) public class BidEvalInfo extends BaseEntity implements Serializable { private static final Long serialVersionUID = 1L; @@ -67,88 +65,4 @@ public class BidEvalInfo extends BaseEntity implements Serializable { @ApiModelProperty(value = "轮次数") private Integer reviewTurnSort; - - public static Long getSerialVersionUID() { - return serialVersionUID; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getReviewType() { - return reviewType; - } - - public void setReviewType(String reviewType) { - this.reviewType = reviewType; - } - - public String getReviewStatus() { - return reviewStatus; - } - - public void setReviewStatus(String reviewStatus) { - this.reviewStatus = reviewStatus; - } - - public String getReviewResultComment() { - return reviewResultComment; - } - - public void setReviewResultComment(String reviewResultComment) { - this.reviewResultComment = reviewResultComment; - } - - public String getProjectId() { - return projectId; - } - - public void setProjectId(String projectId) { - this.projectId = projectId; - } - - public String getSectionId() { - return sectionId; - } - - public void setSectionId(String sectionId) { - this.sectionId = sectionId; - } - - public String getAssessRoomId() { - return assessRoomId; - } - - public void setAssessRoomId(String assessRoomId) { - this.assessRoomId = assessRoomId; - } - - public Integer getAssessRoomSort() { - return assessRoomSort; - } - - public void setAssessRoomSort(Integer assessRoomSort) { - this.assessRoomSort = assessRoomSort; - } - - public String getReviewTurnId() { - return reviewTurnId; - } - - public void setReviewTurnId(String reviewTurnId) { - this.reviewTurnId = reviewTurnId; - } - - public Integer getReviewTurnSort() { - return reviewTurnSort; - } - - public void setReviewTurnSort(Integer reviewTurnSort) { - this.reviewTurnSort = reviewTurnSort; - } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/OpenFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/OpenFeignService.java index c53106e..dac2862 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/OpenFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/OpenFeignService.java @@ -1,7 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.export.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ExportServiceOpenFallbakFactory; import io.swagger.annotations.ApiOperation; @@ -14,7 +13,7 @@ import java.util.List; /** * 调用 OPEN_SERVICE */ -@FeignClient(value = ServiceNameConstants.OPEN_SERVICE,fallbackFactory = ExportServiceOpenFallbakFactory.class) +@FeignClient(value = "${mconfig.feign.name.open}",fallbackFactory = ExportServiceOpenFallbakFactory.class) public interface OpenFeignService { @@ -26,7 +25,7 @@ public interface OpenFeignService { */ @ApiOperation("查询数据") @PostMapping ("/v1/bizbidopenroom/getPostlist") - BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) BizBidOpenroom bizBidOpenroom); + BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) BizBidOpenroom bizBidOpenroom); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java index 866b66a..226103f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java @@ -2,10 +2,8 @@ package com.chinaunicom.mall.ebtp.extend.export.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.extend.export.bean.BizAssessRoom; import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ProcessFeignFallbackFactory; -import com.chinaunicom.mall.ebtp.extend.export.vo.ReviewFlowVO; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; @@ -15,7 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; /** * 评审流程 */ -@FeignClient(value = ServiceNameConstants.PROCESS_SERVICE, fallbackFactory = ProcessFeignFallbackFactory.class) +@FeignClient(value = "${mconfig.feign.name.process}", fallbackFactory = ProcessFeignFallbackFactory.class) public interface ProcessFeignClient { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java index abe4c5b..ddb8d5f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java @@ -1,7 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.export.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectRecordVO; import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ProjectFeignFallbackFactory; @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; /** * 调用 PROJECT_SERVICE */ -@FeignClient(value = ServiceNameConstants.PROJECT_SERVICE,fallbackFactory = ProjectFeignFallbackFactory.class) +@FeignClient(value = "${mconfig.feign.name.project}",fallbackFactory = ProjectFeignFallbackFactory.class) public interface ProjectFeignService { /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RespsFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RespsFeignService.java index 0c61cac..a7da9a2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RespsFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RespsFeignService.java @@ -1,8 +1,8 @@ package com.chinaunicom.mall.ebtp.extend.export.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.export.bean.Tdoc; import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ExportServiceRespsFallbakFactory; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; @@ -14,11 +14,11 @@ import java.util.List; /** * 调用 RESPS_SERVICE */ -@FeignClient(value = ServiceNameConstants.RESPS_SERVICE , fallbackFactory = ExportServiceRespsFallbakFactory.class) +@FeignClient(value = "${mconfig.feign.name.resps}" , fallbackFactory = ExportServiceRespsFallbakFactory.class) public interface RespsFeignService { @PostMapping("/v1/tfile/getTenderQuoteList") - BaseResponse> getTenderQuoteList(@ApiParam(value = "assessRoomId,turnSort", required = true) @RequestBody Tdoc tdocPara); + BaseResponse> getTenderQuoteList(@ApiParam(value = "assessRoomId,turnSort", required = true) @RequestBody Tdoc tdocPara); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RsmsFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RsmsFeignService.java index 03c4286..21f5b77 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RsmsFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RsmsFeignService.java @@ -1,7 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.export.feign; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.extend.export.bean.*; import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ExportServiceFallback; import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailSummaryVO; @@ -20,7 +19,7 @@ import java.util.Map; /** * 调用 RSMS_SERVICE */ -@FeignClient(value = ServiceNameConstants.RSMS_SERVICE, fallbackFactory = ExportServiceFallback.class) +@FeignClient(value = "${mconfig.feign.name.rsms}", fallbackFactory = ExportServiceFallback.class) public interface RsmsFeignService { /** * 不同供应商的打分 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java index 3979c43..b6adc16 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportService.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.export.service; import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; +import org.springframework.beans.factory.annotation.Value; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -8,7 +9,9 @@ import java.io.File; public interface ExportService { - String ERROR_MESSAGE="导出失败，请联系管理员"; + @Value("${mconfig.templet.path}") + String path = ""; + String ERROR_MESSAGE = "导出失败，请联系管理员"; /** * 导出 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java index 4538837..c3d4620 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java @@ -95,7 +95,7 @@ public class BizExportDictServiceImpl extends BaseServiceImpl opt = firstRvwMap.get(bizExportDict.getUrl()).stream().filter(f -> f.getAssessRoomId().equals(roomId)).findFirst(); opt.ifPresent(o -> bizExportDict.setUrl(o.getArchiveFileUrl())); - } else if ("2".equals(bizExportDict.getUrl())) { + } else if (bizExportDict.getUrl().length() < 5) { //查询详审报表 Optional opt = detailRvwMap.get(bizExportDict.getUrl()).stream().filter(f -> f.getAssessRoomId().equals(roomId)).findFirst(); opt.ifPresent(o -> bizExportDict.setUrl(o.getArchiveFileUrl())); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java index e6f689e..7a08ca7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java @@ -12,16 +12,20 @@ import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; import lombok.SneakyThrows; import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFCell; +import org.apache.poi.xssf.streaming.SXSSFRow; +import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -54,7 +58,6 @@ public class DfhzExportServiceImpl implements ExportService { bidEvalInfoDTO.setReviewType(param.getReviewType()); //所有评委数据源 BaseResponse> judges = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO); -// List memberall= exportService.findRegisterAndUser(bidEvalInfoDTO).getData().stream().findFirst().get().getMembers(); BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); bidEvalDetailDTO.setAssessRoomId(param.getAssessRoomId()); @@ -63,65 +66,15 @@ public class DfhzExportServiceImpl implements ExportService { //所有类型打分数据源 BaseResponse>> list = rsmsFeignService.findCategoryResultSummary(bidEvalDetailDTO); if (list != null && judges != null) { + //所有供应商 + List registerVOList = judges.getData(); + + //打分数据 + Map> detailList = list.getData(); + //所有评委 - List memberall = judges.getData().stream().findFirst().get().getMembers(); - //商务数据 - List list1 = list.getData().get("1"); - //服务数据 - List list2 = list.getData().get("5"); - //价格数据 - List list3 = list.getData().get("0"); - // 打分综合汇总 - List all = new ArrayList<>(); - - list1.forEach(o -> { - BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); - object.setSupplierRegisterId(o.getSupplierRegisterId()); - object.setSupplierRegisterName(o.getSupplierRegisterName()); - object.setBusinessAllScore(o.getFinalScore()); - all.add(object); - }); - - all.forEach(x -> { - - list2.forEach(y -> { - if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { - x.setServiceAllScore(y.getFinalScore()); - } - }); - - list3.forEach(z -> { - if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { - x.setPriceAllScore(z.getFinalScore()); - } - }); - - BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); - x.setAllScore(allPrice); - }); - - - //参与打分评委 - Map members = list1.get(0).getScoreMap(); - //列头 - StringBuffer titles0 = new StringBuffer("投标人名称,投标序号"); - ArrayList strings = new ArrayList<>(); - //评委专家信息添加到列头 根据参加打分专家的id到所有专家列表中查询名字 - List finalMemberall = memberall; - members.forEach((k, v) -> { - finalMemberall.forEach(x -> { - if (k.equals(x.getUserId())) { - titles0.append(",").append(x.getName()); - } - }); - strings.add(v.getCreateBy()); - }); - //添加最后一列 - titles0.append(",平均分"); - //最终的列头 - String titles = titles0.toString(); - - + List memberAll = registerVOList.stream().findFirst().get().getMembers(); + ArrayList strings = memberAll.stream().map(MemberVO::getUserId).collect(Collectors.toCollection(ArrayList::new)); // 创建工作簿 SXSSFWorkbook wb = new SXSSFWorkbook(); //表格样式 @@ -136,171 +89,264 @@ public class DfhzExportServiceImpl implements ExportService { cellStyle.setBorderTop(BorderStyle.THIN);//上边框 cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + SXSSFSheet sheet = wb.createSheet(); + int rowIndex = 0; + //头 + SXSSFRow titleRow = sheet.createRow(rowIndex++); + Cell titleCell1 = titleRow.createCell(0); + titleRow.setHeightInPoints(35); + titleCell1.setCellValue("打分汇总表"); + titleCell1.setCellStyle(cellStyle); + + //项目名称 + SXSSFRow projectNameRow = sheet.createRow(rowIndex++); + SXSSFCell projectNameCell0 = projectNameRow.createCell(0); + projectNameCell0.setCellValue("项目名称："); + SXSSFCell projectNameCell1 = projectNameRow.createCell(1); + projectNameCell1.setCellValue("了大方拉酥颗点肌肤"); + //招标编号 + SXSSFRow projectNumRow = sheet.createRow(rowIndex++); + SXSSFCell projectNumCell0 = projectNumRow.createCell(0); + projectNumCell0.setCellValue("项目编号："); + SXSSFCell projectNumCell1 = projectNumRow.createCell(1); + projectNumCell1.setCellValue("1111"); + + //商务 技术 服务 + for (int i = 0; i < 3; i++) { + boolean hasContains = false; + if (i == 0) { + hasContains = detailList.containsKey("1"); + } else if (i == 1) { + hasContains = detailList.containsKey("2"); + } else { + hasContains = detailList.containsKey("5"); + } + if (!hasContains) { + continue; + } + //列头 + List titles0 = new ArrayList<>(); + titles0.add("投标人名称"); + titles0.add("投标序号"); + + //评委专家信息添加到列头 根据参加打分专家的id到所有专家列表中查询名字 + memberAll.forEach(x -> titles0.add(x.getName())); + //添加最后一列 + titles0.add("平均分"); + + SXSSFRow row = sheet.createRow(rowIndex++); + SXSSFCell c = row.createCell(0); + if (i == 0) { + c.setCellValue("商务分数"); + } else if (i == 1) { + c.setCellValue("技术分数"); + } else { + c.setCellValue("服务分数"); + } + + int cellIndex = 0; + for (String tit : titles0) { + c = row.createCell(cellIndex++); + c.setCellValue(tit); + } + int index = 1; + + for (SupplierRegisterVO vo : registerVOList) { + cellIndex = 0; + row = sheet.createRow(rowIndex++); + c = row.createCell(cellIndex++); + c.setCellValue(vo.getSupplierRegisterName()); + c = row.createCell(cellIndex++); + c.setCellValue(index++); + + BidEvalDetailSummaryVO detailScore; + if (i == 0) { + detailScore = detailList.get("1").stream().filter(f -> f.getSupplierRegisterId().equals(vo.getSupplierRegisterId())).findFirst().get(); + } else if (i == 1) { + detailScore = detailList.get("2").stream().filter(f -> f.getSupplierRegisterId().equals(vo.getSupplierRegisterId())).findFirst().get(); + } else { + detailScore = detailList.get("5").stream().filter(f -> f.getSupplierRegisterId().equals(vo.getSupplierRegisterId())).findFirst().get(); + } + + + Map memberScoreMap = detailScore.getScoreMap(); + for (MemberVO memberVO : memberAll) { + BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); + c = row.createCell(cellIndex++); + c.setCellValue(score == null ? "" : String.valueOf(score)); + } + c = row.createCell(cellIndex); + c.setCellValue(detailScore.getFinalScore() == null ? "" : String.valueOf(detailScore.getFinalScore())); + + } + } + + //渲染所有数据表格 List createList = null; /** * 一共4个表，固定循环4次 */ - for (int k = 0; k < 4; k++) { - // 创建表格 - Sheet sheet = null; - if (k == 0) { - sheet = wb.createSheet("商务得分"); - } else if (k == 1) { - sheet = wb.createSheet("服务得分"); - } else if (k == 2) { - sheet = wb.createSheet("价格得分"); - titles = "投标人名称,投标序号,价格得分"; - - } else { - sheet = wb.createSheet("评分汇总表"); - titles = "投标人名称,投标序号,商务得分,服务得分,价格得分,综合得分"; - - } - sheet.createFreezePane(1, 1); - - //最右侧列值 - Integer index = (titles.split(",").length) - 1; - //行 - int rowIndex = 0; - //列 - int colIndex = 0; - - // 1行 表头 - CellRangeAddress region1 = new CellRangeAddress(0, 0, 0, index); - sheet.addMergedRegion(region1); - Row title1 = sheet.createRow(rowIndex++); - Cell titleCell1 = title1.createCell(0); - title1.setHeightInPoints(35); - titleCell1.setCellValue("打分汇总表"); - titleCell1.setCellStyle(cellStyle); - // 2行 - /* CellRangeAddress region2 = new CellRangeAddress(1, 1, 0, index); - sheet.addMergedRegion(region2); - Row title2 = sheet.createRow(rowIndex++); - Cell titleCell2 = title2.createCell(0); - titleCell2.setCellValue("包名 ：bao123456"); - //3行 - CellRangeAddress region3 = new CellRangeAddress(2, 2, 0, index); - sheet.addMergedRegion(region3); - Row title3 = sheet.createRow(rowIndex++); - Cell titleCell3 = title3.createCell(0); - titleCell3.setCellValue("招标编号 bh123456");*/ - //4行 得分标题 - CellRangeAddress region4 = new CellRangeAddress(1, 1, 0, index); - sheet.addMergedRegion(region4); - Row title4 = sheet.createRow(rowIndex++); - Cell titleCell4 = title4.createCell(0); - if (k == 0) { - titleCell4.setCellValue("商务得分"); - createList = list1; - } else if (k == 1) { - titleCell4.setCellValue("服务得分"); - createList = list2; - } else if (k == 2) { - titleCell4.setCellValue("价格得分"); - createList = list3; - } else { - titleCell4.setCellValue("评分汇总"); - } - - //5行 列头 - Row titleRow5 = sheet.createRow(rowIndex++); - // 设置高度为30 - titleRow5.setHeightInPoints(30); - for (String title : titles.split(",")) { - sheet.setColumnWidth(colIndex, 17 * 256); - Cell titleCell = titleRow5.createCell(colIndex++); - titleCell.setCellValue(title); - //设置样式 - titleCell.setCellStyle(cellStyle); - } - //6行 数据行 - int num = 1; - if (k == 3) { - for (int i = 0; i < all.size(); i++) { - //3为最终汇总表 - Row titleRowN = sheet.createRow(rowIndex++); - colIndex = 0; - //投标人名称 - Cell cell = titleRowN.createCell(colIndex++); - cell.setCellStyle(cellStyle); - cell.setCellValue(all.get(i).getSupplierRegisterName()); - //序号 - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellStyle(cellStyle); - cell1.setCellValue(num++); - //商务汇总 - Cell cell2 = titleRowN.createCell(colIndex++); - cell2.setCellStyle(cellStyle); - cell2.setCellValue(all.get(i).getBusinessAllScore().toString()); - //服务汇总 - Cell cell3 = titleRowN.createCell(colIndex++); - cell3.setCellStyle(cellStyle); - cell3.setCellValue(all.get(i).getServiceAllScore().toString()); - //价格汇总 - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); - cell4.setCellValue(all.get(i).getPriceAllScore().toString()); - //综合得分 - Cell cell5 = titleRowN.createCell(colIndex++); - cell5.setCellStyle(cellStyle); - cell5.setCellValue(all.get(i).getAllScore().toString()); - } - } else { - for (int i = 0; i < createList.size(); i++) { - colIndex = 0; - Row titleRowN = sheet.createRow(rowIndex++); - //投标人名称 - Cell cell = titleRowN.createCell(colIndex++); - cell.setCellStyle(cellStyle); - cell.setCellValue(createList.get(i).getSupplierRegisterName()); - //序号 - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellStyle(cellStyle); - cell1.setCellValue(num++); - if (k == 2) { - //价格得分 2时无专家评分，有最终评分 - Cell cellN1 = titleRowN.createCell(colIndex++); - cellN1.setCellStyle(cellStyle); - cellN1.setCellValue(createList.get(i).getFinalScore().toString()); - } else { - //所有专家 - for (int j = 0; j < createList.get(i).getScoreMap().size(); j++) { - Map scoreMap = createList.get(i).getScoreMap(); - //获取专家的顺序 - if (scoreMap != null) { - String score = null; - for (String string : strings) { - if (scoreMap.get(string) != null) { - score = (scoreMap.get(string).getScore()).toString(); - } else { - score = "无"; - } - Cell cellN = titleRowN.createCell(colIndex++); - cellN.setCellStyle(cellStyle); - cellN.setCellValue(score); - } - - } - - - } - //平均分 - Cell cellN1 = titleRowN.createCell(colIndex++); - cellN1.setCellStyle(cellStyle); - cellN1.setCellValue(createList.get(i).getFinalScore().toString()); - } - } - } - } +// for (int k = 0; k < 4; k++) { +// // 创建表格 +// Sheet sheet = null; +// if (k == 0) { +// sheet = wb.createSheet("商务得分"); +// } else if (k == 1) { +// sheet = wb.createSheet("服务得分"); +// } else if (k == 2) { +// sheet = wb.createSheet("价格得分"); +// titles = "投标人名称,投标序号,价格得分"; +// +// } else { +// sheet = wb.createSheet("评分汇总表"); +// titles = "投标人名称,投标序号,商务得分,服务得分,价格得分,综合得分"; +// +// } +// sheet.createFreezePane(1, 1); +// +// //最右侧列值 +// Integer index = (titles.split(",").length) - 1; +// //行 +// int rowIndex = 0; +// //列 +// int colIndex = 0; +// +// // 1行 表头 +// CellRangeAddress region1 = new CellRangeAddress(0, 0, 0, index); +// sheet.addMergedRegion(region1); +// Row title1 = sheet.createRow(rowIndex++); +// Cell titleCell1 = title1.createCell(0); +// title1.setHeightInPoints(35); +// titleCell1.setCellValue("打分汇总表"); +// titleCell1.setCellStyle(cellStyle); +// // 2行 +// /* CellRangeAddress region2 = new CellRangeAddress(1, 1, 0, index); +// sheet.addMergedRegion(region2); +// Row title2 = sheet.createRow(rowIndex++); +// Cell titleCell2 = title2.createCell(0); +// titleCell2.setCellValue("包名 ：bao123456"); +// //3行 +// CellRangeAddress region3 = new CellRangeAddress(2, 2, 0, index); +// sheet.addMergedRegion(region3); +// Row title3 = sheet.createRow(rowIndex++); +// Cell titleCell3 = title3.createCell(0); +// titleCell3.setCellValue("招标编号 bh123456");*/ +// //4行 得分标题 +// CellRangeAddress region4 = new CellRangeAddress(1, 1, 0, index); +// sheet.addMergedRegion(region4); +// Row title4 = sheet.createRow(rowIndex++); +// Cell titleCell4 = title4.createCell(0); +// if (k == 0) { +// titleCell4.setCellValue("商务得分"); +// createList = list1; +// } else if (k == 1) { +// titleCell4.setCellValue("服务得分"); +// createList = list2; +// } else if (k == 2) { +// titleCell4.setCellValue("价格得分"); +// createList = list3; +// } else { +// titleCell4.setCellValue("评分汇总"); +// } +// +// //5行 列头 +// Row titleRow5 = sheet.createRow(rowIndex++); +// // 设置高度为30 +// titleRow5.setHeightInPoints(30); +// for (String title : titles.split(",")) { +// sheet.setColumnWidth(colIndex, 17 * 256); +// Cell titleCell = titleRow5.createCell(colIndex++); +// titleCell.setCellValue(title); +// //设置样式 +// titleCell.setCellStyle(cellStyle); +// } +// //6行 数据行 +// int num = 1; +// if (k == 3) { +// for (int i = 0; i < all.size(); i++) { +// //3为最终汇总表 +// Row titleRowN = sheet.createRow(rowIndex++); +// colIndex = 0; +// //投标人名称 +// Cell cell = titleRowN.createCell(colIndex++); +// cell.setCellStyle(cellStyle); +// cell.setCellValue(all.get(i).getSupplierRegisterName()); +// //序号 +// Cell cell1 = titleRowN.createCell(colIndex++); +// cell1.setCellStyle(cellStyle); +// cell1.setCellValue(num++); +// //商务汇总 +// Cell cell2 = titleRowN.createCell(colIndex++); +// cell2.setCellStyle(cellStyle); +// cell2.setCellValue(all.get(i).getBusinessAllScore().toString()); +// //服务汇总 +// Cell cell3 = titleRowN.createCell(colIndex++); +// cell3.setCellStyle(cellStyle); +// cell3.setCellValue(all.get(i).getServiceAllScore().toString()); +// //价格汇总 +// Cell cell4 = titleRowN.createCell(colIndex++); +// cell4.setCellStyle(cellStyle); +// cell4.setCellValue(all.get(i).getPriceAllScore().toString()); +// //综合得分 +// Cell cell5 = titleRowN.createCell(colIndex++); +// cell5.setCellStyle(cellStyle); +// cell5.setCellValue(all.get(i).getAllScore().toString()); +// } +// } else { +// for (int i = 0; i < createList.size(); i++) { +// colIndex = 0; +// Row titleRowN = sheet.createRow(rowIndex++); +// //投标人名称 +// Cell cell = titleRowN.createCell(colIndex++); +// cell.setCellStyle(cellStyle); +// cell.setCellValue(createList.get(i).getSupplierRegisterName()); +// //序号 +// Cell cell1 = titleRowN.createCell(colIndex++); +// cell1.setCellStyle(cellStyle); +// cell1.setCellValue(num++); +// if (k == 2) { +// //价格得分 2时无专家评分，有最终评分 +// Cell cellN1 = titleRowN.createCell(colIndex++); +// cellN1.setCellStyle(cellStyle); +// cellN1.setCellValue(createList.get(i).getFinalScore().toString()); +// } else { +// //所有专家 +// for (int j = 0; j < createList.get(i).getScoreMap().size(); j++) { +// Map scoreMap = createList.get(i).getScoreMap(); +// //获取专家的顺序 +// if (scoreMap != null) { +// String score = null; +// for (String string : strings) { +// if (scoreMap.get(string) != null) { +// score = (scoreMap.get(string).getScore()).toString(); +// } else { +// score = "无"; +// } +// Cell cellN = titleRowN.createCell(colIndex++); +// cellN.setCellStyle(cellStyle); +// cellN.setCellValue(score); +// } +// +// } +// +// +// } +// //平均分 +// Cell cellN1 = titleRowN.createCell(colIndex++); +// cellN1.setCellStyle(cellStyle); +// cellN1.setCellValue(createList.get(i).getFinalScore().toString()); +// } +// } +// } +// } String filename = "打分汇总表.xls"; filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); response.reset(); response.setContentType("application/octet-stream;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1))); wb.write(response.getOutputStream()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PbbgExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PbbgExportServiceImpl.java index 74792e7..9a2fc3e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PbbgExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PbbgExportServiceImpl.java @@ -120,25 +120,25 @@ public class PbbgExportServiceImpl implements ExportService { BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); object.setSupplierRegisterId(o.getSupplierRegisterId()); object.setSupplierRegisterName(o.getSupplierRegisterName()); - object.setBusinessAllScore(o.getFinalScore()); +// object.setBusinessAllScore(o.getFinalScore()); all1.add(object); }); all1.forEach(x -> { respondlist2.forEach(y -> { if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { - x.setServiceAllScore(y.getFinalScore()); +// x.setServiceAllScore(y.getFinalScore()); } }); respondlist3.forEach(z -> { if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { - x.setPriceAllScore(z.getFinalScore()); +// x.setPriceAllScore(z.getFinalScore()); } }); - BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); - x.setAllScore(allPrice); +// BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); +// x.setAllScore(allPrice); }); //表六 详细评审数据 @@ -147,8 +147,8 @@ public class PbbgExportServiceImpl implements ExportService { Map map = new HashMap<>(); map.put("num", (i + 1)); map.put("tbr", all1.get(i).getSupplierRegisterName()); - map.put("js", all1.get(i).getServiceAllScore()); - map.put("sw", all1.get(i).getBusinessAllScore()); +// map.put("js", all1.get(i).getServiceAllScore()); +// map.put("sw", all1.get(i).getBusinessAllScore()); list6.add(map); } @@ -159,7 +159,7 @@ public class PbbgExportServiceImpl implements ExportService { Map map = new HashMap<>(); map.put("num", i); map.put("tbr", all1.get(i).getSupplierRegisterName()); - map.put("bj", all1.get(i).getPriceAllScore()); +// map.put("bj", all1.get(i).getPriceAllScore()); map.put("psjg", ""); map.put("jgdf", ""); list7.add(map); @@ -171,10 +171,10 @@ public class PbbgExportServiceImpl implements ExportService { Map map = new HashMap<>(); map.put("num", (i + 1)); map.put("tbr", all1.get(i).getSupplierRegisterName()); - map.put("sw", all1.get(i).getBusinessAllScore()); - map.put("js", all1.get(i).getServiceAllScore()); - map.put("jg", all1.get(i).getPriceAllScore()); - map.put("zhdf", all1.get(i).getAllScore()); +// map.put("sw", all1.get(i).getBusinessAllScore()); +// map.put("js", all1.get(i).getServiceAllScore()); +// map.put("jg", all1.get(i).getPriceAllScore()); +// map.put("zhdf", all1.get(i).getAllScore()); map.put("bj", ""); list8.add(map); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java index 4cadb00..49575e4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java @@ -50,64 +50,4 @@ public class BidEvalDetailSummaryVO implements Serializable { private Map scoreMap; - @ApiModelProperty(value = "供应商商务汇总") - private BigDecimal businessAllScore; - - @ApiModelProperty(value = "供应商服务汇总") - private BigDecimal serviceAllScore; - - @ApiModelProperty(value = "供应商价格汇总") - private BigDecimal priceAllScore; - - @ApiModelProperty(value = "供应商综合汇总") - private BigDecimal allScore; - - - public String getSupplierRegisterId() { - return supplierRegisterId; - } - - public void setSupplierRegisterId(String supplierRegisterId) { - this.supplierRegisterId = supplierRegisterId; - } - - public String getSupplierRegisterName() { - return supplierRegisterName; - } - - public void setSupplierRegisterName(String supplierRegisterName) { - this.supplierRegisterName = supplierRegisterName; - } - - public BigDecimal getBusinessAllScore() { - return businessAllScore; - } - - public void setBusinessAllScore(BigDecimal businessAllScore) { - this.businessAllScore = businessAllScore; - } - - public BigDecimal getServiceAllScore() { - return serviceAllScore; - } - - public void setServiceAllScore(BigDecimal serviceAllScore) { - this.serviceAllScore = serviceAllScore; - } - - public BigDecimal getPriceAllScore() { - return priceAllScore; - } - - public void setPriceAllScore(BigDecimal priceAllScore) { - this.priceAllScore = priceAllScore; - } - - public BigDecimal getAllScore() { - return allScore; - } - - public void setAllScore(BigDecimal allScore) { - this.allScore = allScore; - } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java index 6d9962a..4dfab43 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java @@ -56,79 +56,9 @@ public class SupplierRegisterPriceScoreVO implements Serializable { @ApiModelProperty(value = "最高分") private BigDecimal highScore; - public static Long getSerialVersionUID() { - return serialVersionUID; - } + @ApiModelProperty(value = "自动报价-报价分") + private String showValue; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getSupplierRegisterId() { - return supplierRegisterId; - } - - public void setSupplierRegisterId(String supplierRegisterId) { - this.supplierRegisterId = supplierRegisterId; - } - - public String getDetailId() { - return detailId; - } - - public void setDetailId(String detailId) { - this.detailId = detailId; - } - - public String getSupplierRegisterName() { - return supplierRegisterName; - } - - public void setSupplierRegisterName(String supplierRegisterName) { - this.supplierRegisterName = supplierRegisterName; - } - - public String getTdocId() { - return tdocId; - } - - public void setTdocId(String tdocId) { - this.tdocId = tdocId; - } - - public BigDecimal getBidContent() { - return bidContent; - } - - public void setBidContent(BigDecimal bidContent) { - this.bidContent = bidContent; - } - - public BigDecimal getEvaluatingContent() { - return evaluatingContent; - } - - public void setEvaluatingContent(BigDecimal evaluatingContent) { - this.evaluatingContent = evaluatingContent; - } - - public String getPriceScore() { - return priceScore; - } - - public void setPriceScore(String priceScore) { - this.priceScore = priceScore; - } - - public BigDecimal getHighScore() { - return highScore; - } - - public void setHighScore(BigDecimal highScore) { - this.highScore = highScore; - } + @ApiModelProperty(value = "自动报价-是否选择 1是 空值否") + private Integer chooseStatus; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d3643c2..52a1102 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -15,7 +15,10 @@ apollo: enabled: true eagerLoad: enabled: true - +seata: + service: + vgroup-mapping: + biz-service-ebtp-extend-service-group: default spring: aop: auto: true #开启spring的aop配置 @@ -87,35 +90,6 @@ spring: master: eshop-redis nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716 password: Unicom#135 - - lettuce: - # jedis: - pool: - maxTotal: 50 - minIdle: 1 - maxWaitMillis: 5000 - maxIdle: 5 - testOnBorrow: true - testOnReturn: true - testWhileIdle: true - token: - database: 0 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - uuid: - database: 1 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - cache: - database: 2 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 # 天宫Eureka配置 eureka: @@ -165,23 +139,14 @@ ribbon: mconfig: workerId: 1 datacenterId: 1 - remote: - approval: true #是否需要提交公告审批 - media: true #是否需要发送到媒体 - - #中国联通电子商城外网接入平台 相关参数 - token: - userName: zbgg - password: eip_13579 - file-wjpt-storage-path: http://111.198.162.67:8081/enr/api/base/file/cgDownload/ #测试地址 - #获取file地址 - file: - address: http://10.242.31.158:8100/core-service-ebtp-updownload/v1/download/oid/ - #提交审批相关字段 - approve: - wfSectionNo: 002 - wfSectionName: 采购审批 - + # 服务名 + feign: + name: + open: biz-service-ebtp-opening #开标大厅服务 + process: biz-service-ebtp-process #评审流程服务 + project: biz-service-ebtp-project #项目服务 + resps: biz-service-ebtp-resps #应答结构化服务 + rsms: biz-service-ebtp-rsms #评审结构化服务 # 用户暴露给 prometheus 的健康数据 management: endpoints: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index aac9a57..cd8215c 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -2,42 +2,41 @@ server: port: 18018 servlet: context-path: / - + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + meta: http://10.242.31.158:6001/ + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true seata: - enabled: true - application-id: biz-service-ebtp-extend - tx-service-group: biz-service-ebtp-extend-group - enable-auto-data-source-proxy: true - use-jdk-proxy: false service: vgroup-mapping: - default: default - enable-degrade: false - disable-global-transaction: false - registry: - type: eureka - eureka: - weight: 1 - service-url: http://${eureka.instance.hostname}:8761/eureka/ - + biz-service-ebtp-extend-dev-service-group: default spring: aop: auto: true #开启spring的aop配置 proxy-target-class: true + application: - name: biz-service-ebtp-extend + name: biz-service-ebtp-extend-dev shardingsphere: datasource: - # names: ds0,ds1 #主从库名称 开启主从时必须打开 names: ds0 ds0: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - username: mall3-ebtp-dev - password: mall3-ebtp-dev - jdbc-url: jdbc:mysql://125.32.114.204:13306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://125.32.114.204:13306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: root + jdbc-url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 @@ -52,77 +51,51 @@ spring: poolPreparedStatements: true maxOpenPreparedStatements: 20 connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 - props: - sql: - show: true + props: + sql: + show: true jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 serialization: write-dates-as-timestamps: false - kafka: - bootstrap-servers: 127.0.0.1:9092 - producer: - # 写入失败时，重试次数。当leader节点失效，一个repli节点会替代成为leader节点，此时可能出现写入失败， - # 当retris为0时，produce不会重复。retirs重发，此时repli节点完全成为leader节点，不会产生消息丢失。 - retries: 0 - # 每次批量发送消息的数量,produce积累到一定数据，一次发送 - batch-size: 2 - # produce积累数据一次发送，缓存大小达到buffer.memory就发送数据 - buffer-memory: 33554432 - #procedure要求leader在考虑完成请求之前收到的确认数，用于控制发送记录在服务端的持久化，其值可以为如下： - #acks = 0 如果设置为零，则生产者将不会等待来自服务器的任何确认，该记录将立即添加到套接字缓冲区并视为已发送。在这种情况下，无法保证服务器已收到记录，并且重试配置将不会生效（因为客户端通常不会知道任何故障），为每条记录返回的偏移量始终设置为-1。 - #acks = 1 这意味着leader会将记录写入其本地日志，但无需等待所有副本服务器的完全确认即可做出回应，在这种情况下，如果leader在确认记录后立即失败，但在将数据复制到所有的副本服务器之前，则记录将会丢失。 - #acks = all 这意味着leader将等待完整的同步副本集以确认记录，这保证了只要至少一个同步副本服务器仍然存活，记录就不会丢失，这是最强有力的保证，这相当于acks = -1的设置。 - #可以设置的值为：all, -1, 0, 1 - acks: 1 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - consumer: - group-id: user-group - auto-offset-reset: earliest - enable-auto-commit: true - auto-commit-interval: 100 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - #=========redis基础配置========= - redis: - lettuce: - # jedis: - pool: - maxTotal: 50 - minIdle: 1 - maxWaitMillis: 5000 - maxIdle: 5 - testOnBorrow: true - testOnReturn: true - testWhileIdle: true - token: - database: 0 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - uuid: - database: 1 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 - cache: - database: 2 - host: 125.32.114.204 - port: 16379 - password: redis@CC1234 - timeout: 6000 -#=========eureka配置========= + # 天宫Kafka增加了安全认证，需要配置安全属性 + kafka: + bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005 + template: + default-topic: jl_test + + # 生产者配置参数 + producer: + client-id: core-service-ebtp-crypt + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; + + # 消费者配置参数 + consumer: + group-id: core-service-ebtp-crypt-consumer + auto-offset-reset: latest + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; + + # 天宫 redis 需要使用哨兵进行访问 + redis: + sentinel: + master: eshop-redis + nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716 + password: Unicom#135 + +# 天宫Eureka配置 eureka: client: service-url: - defaultZone: http://125.32.114.204:8761/eureka/ - # defaultZone: http://192.168.1.103:8761/eureka/ + defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka instance: prefer-ip-address: true instance-id: 125.32.114.204:${server.port} @@ -143,50 +116,44 @@ mybatis-plus: # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic logic-delete-value: deleted # 逻辑已删除值 logic-not-delete-value: normal # 逻辑未删除值 -# --------------feign ------------ -feign: - hystrix: - enabled: true - httpclient: - enabled: false - okhttp: - enabled: true - client: - config: - default: - connect-timeout: 20000 - read-timeout: 20000 + hystrix: command: default: execution: + timeout: + enabled: true isolation: + strategy: SEMAPHORE thread: timeoutInMilliseconds: 200000 #熔断超时时间 circuitBreaker: sleepWindowInMilliseconds: 20000 forceClosed: true + ribbon: ReadTimeout: 20000 #请求处理的超时时间 ConnectTimeout: 20000 #请求连接超时时间 MaxAutoRetries: 0 #对当前实例的重试次数 MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 + mconfig: workerId: 1 datacenterId: 1 - remote: - approval: true #是否需要提交公告审批 - media: true #是否需要发送到媒体 - - #中国联通电子商城外网接入平台 相关参数 - token: - userName: zbgg - password: eip_13579 - file-wjpt-storage-path: http://111.198.162.67:8081/enr/api/base/file/cgDownload/ #测试地址 - #获取file地址 - file: - address: http://125.32.114.204:8760/api/core-service-ebtp-updownload/v1/download/oid/ - #提交审批相关字段 - approve: - wfSectionNo: 002 - wfSectionName: 采购审批 \ No newline at end of file + # 服务名 + feign: + name: + open: biz-service-ebtp-opening-dev #开标大厅服务 + process: biz-service-ebtp-process-dev #评审流程服务 + project: biz-service-ebtp-project-dev #项目服务 + resps: biz-service-ebtp-resps-dev #应答结构化服务 + rsms: biz-service-ebtp-rsms-dev #评审结构化服务 +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" diff --git a/src/main/resources/file.conf b/src/main/resources/file.conf deleted file mode 100644 index 1171080..0000000 --- a/src/main/resources/file.conf +++ /dev/null @@ -1,67 +0,0 @@ -transport { - # tcp udt unix-domain-socket - type = "TCP" - #NIO NATIVE - server = "NIO" - #enable heartbeat - heartbeat = true - # the client batch send request enable - enableClientBatchSendRequest = true - #thread factory for netty - threadFactory { - bossThreadPrefix = "NettyBoss" - workerThreadPrefix = "NettyServerNIOWorker" - serverExecutorThread-prefix = "NettyServerBizHandler" - shareBossWorker = false - clientSelectorThreadPrefix = "NettyClientSelector" - clientSelectorThreadSize = 1 - clientWorkerThreadPrefix = "NettyClientWorkerThread" - # netty boss thread size,will not be used for UDT - bossThreadSize = 1 - #auto default pin or 8 - workerThreadSize = "default" - } - shutdown { - # when destroy server, wait seconds - wait = 3 - } - serialization = "seata" - compressor = "none" -} - -service { - #transaction service group mapping - vgroupMapping.biz-service-ebtp-extend-service-group = "default" - #only support when registry.type=file, please don't set multiple addresses - default.grouplist = "10.242.31.158:18035" - #degrade, current not support - enableDegrade = false - #disable seata - disableGlobalTransaction = false -} - -client { - rm { - asyncCommitBufferLimit = 10000 - lock { - retryInterval = 10 - retryTimes = 30 - retryPolicyBranchRollbackOnConflict = true - } - reportRetryCount = 5 - tableMetaCheckEnable = false - reportSuccessEnable = false - } - tm { - commitRetryCount = 5 - rollbackRetryCount = 5 - } - undo { - dataValidation = true - logSerialization = "jackson" - logTable = "undo_log" - } - log { - exceptionRate = 100 - } -} \ No newline at end of file diff --git a/src/main/resources/registry.conf b/src/main/resources/registry.conf deleted file mode 100644 index 0a4eb4c..0000000 --- a/src/main/resources/registry.conf +++ /dev/null @@ -1,15 +0,0 @@ -registry { - type = "file" - - file { - name = "file.conf" - } -} - -config { - type = "file" - - file { - name = "file.conf" - } -} \ No newline at end of file