diff --git a/deployment-dev.yaml b/deployment-dev.yaml index 3c7e0bd..12bfa41 100644 --- a/deployment-dev.yaml +++ b/deployment-dev.yaml @@ -35,10 +35,18 @@ spec: # 定义容器模板,该模板可以包含多个容器 spec: + volumes: + - name: log + hostPath: + path: /var/lib/docker/log/349553515466-test/default-group/all #开发环境 # 必选,Pod中容器列表 containers: - name: biz-service-ebtp-extend image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest + # 在容器中挂载日志存储区 + volumeMounts: + - name: log + mountPath: /log # 需要暴露的端口库号列表 ports: - containerPort: 18018 @@ -46,7 +54,7 @@ spec: env: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE - value: http://10.242.37.1488:6001 + value: http://10.242.37.148:6001 - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES value: skywalking-oap-cluster.skywalking:11800 - name: SW_AGENT_NAME diff --git a/deployment-sim.yaml b/deployment-sim.yaml index 50a52d0..6d1ff47 100644 --- a/deployment-sim.yaml +++ b/deployment-sim.yaml @@ -37,9 +37,8 @@ spec: spec: volumes: - name: log - persistentVolumeClaim: - claimName: log-pvc - readOnly: false + hostPath: + path: /var/lib/docker/log/349553515466-preprod/default-group/all #开发环境 affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: diff --git a/deployment-uat.yaml b/deployment-uat.yaml index 3d2e32d..c166313 100644 --- a/deployment-uat.yaml +++ b/deployment-uat.yaml @@ -38,9 +38,8 @@ spec: # 挂载日志存储 volumes: - name: log - persistentVolumeClaim: - claimName: log-pvc - readOnly: false + hostPath: + path: /var/lib/docker/log/349553515466-uat/default-group/all #开发环境 # 必选,Pod中容器列表 containers: diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java index e292cb9..58a2b47 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java @@ -1,6 +1,10 @@ package com.chinaunicom.mall.ebtp.extend; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; +import io.micrometer.core.instrument.MeterRegistry; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -13,40 +17,34 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; - -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.IdUtil; -import io.micrometer.core.instrument.MeterRegistry; - -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class }) +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class}) @EnableFeignClients @EnableEurekaClient -@MapperScan({ "com.chinaunicom.mall.ebtp.extend.**.dao" }) +@MapperScan({"com.chinaunicom.mall.ebtp.extend.**.dao"}) @ComponentScan("com.chinaunicom.mall.ebtp.*") @EnableApolloConfig public class BizServiceEbtpExtendApplication { - public static void main(String[] args) { - SpringApplication.run(BizServiceEbtpExtendApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(BizServiceEbtpExtendApplication.class, args); + } - @Bean - @ConditionalOnMissingBean(Snowflake.class) - public Snowflake snowflake() { - return IdUtil.getSnowflake(23, 16); - } + @Bean + @ConditionalOnMissingBean(Snowflake.class) + public Snowflake snowflake() { + return IdUtil.getSnowflake(23, 16); + } - /** - * Grafana 注册项 - * - * @param applicationName 应用名称, 用于grafana应用列表 - * @return - */ - @Bean - public MeterRegistryCustomizer configurer( - @Value("${spring.application.name}") String applicationName) { - return (registry) -> registry.config().commonTags("application", applicationName); - } + /** + * Grafana 注册项 + * + * @param applicationName 应用名称, 用于grafana应用列表 + * @return + */ + @Bean + public MeterRegistryCustomizer configurer( + @Value("${spring.application.name}") String applicationName) { + return (registry) -> registry.config().commonTags("application", applicationName); + } } 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 e200bac..74b6bbc 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 @@ -23,51 +23,51 @@ import java.io.Serializable; @TableName(value = "biz_bid_notice", autoResultMap = true) public class BizBidNotice 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 = "noticeName") - private String noticeName; + /** + * + */ + @ApiModelProperty(value = "noticeName") + private String noticeName; - /** - * 标题 - */ - @ApiModelProperty(value = "标题") - private String noticeTitle; + /** + * 标题 + */ + @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 noticeContent; + /** + * 文件ID + */ + @ApiModelProperty(value = "文件ID") + private String noticeFile; + /** + * 是否发布 + */ + @ApiModelProperty(value = "是否发布") + private String noticeRelease; - /** - * 是否置顶 - */ - @ApiModelProperty(value = "是否置顶") - private String noticeTop; + /** + * 是否置顶 + */ + @ApiModelProperty(value = "是否置顶") + private String noticeTop; - @ApiModelProperty("逻辑删除,normal表示正常(默认),deleted表示删除") - @TableLogic - private String deleteFlag; + @ApiModelProperty("逻辑删除,normal表示正常(默认),deleted表示删除") + @TableLogic + private String deleteFlag; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/AuthorizeController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/AuthorizeController.java index eaac104..e0e5958 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/AuthorizeController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/AuthorizeController.java @@ -1,7 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; -import java.security.Principal; - +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; @@ -11,26 +11,26 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import java.security.Principal; @RestController @RequestMapping("v1") public class AuthorizeController { - private @Autowired IBaseCacheUserService service; + private @Autowired + IBaseCacheUserService service; - @GetMapping("user") - @ResponseStatus(code = HttpStatus.OK) - public Object user(Principal principal) { - BaseCacheUser cacheUser = service.getCacheUser(); - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + @GetMapping("user") + @ResponseStatus(code = HttpStatus.OK) + public Object user(Principal principal) { + BaseCacheUser cacheUser = service.getCacheUser(); + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - System.out.println(auth.getName()); - System.out.println(auth.getAuthorities()); - System.out.println(principal); + System.out.println(auth.getName()); + System.out.println(auth.getAuthorities()); + System.out.println(principal); - return cacheUser; - } + return cacheUser; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageCategoryController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageCategoryController.java index 5632a7f..65f0ef1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageCategoryController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageCategoryController.java @@ -1,96 +1,87 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -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.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageCategoryAddDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageCategoryUpdateDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageCategory; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageCategoryService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.BizMessageCategoryVO; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; @Api(value = "消息类别维护", description = "消息类别维护") @RestController @RequestMapping("/v1/category/") public class BizMessageCategoryController { - private @Autowired BizMessageCategoryService service; + private @Autowired + BizMessageCategoryService service; - @ApiOperation("消息类别列表.") - @GetMapping("/list") - @ResponseStatus(code = HttpStatus.OK) - public List list() { - return service.listAll().stream().map(source -> { - BizMessageCategoryVO vo = new BizMessageCategoryVO(); - BeanUtils.copyProperties(source, vo); - return vo; - }).collect(Collectors.toList()); - } + @ApiOperation("消息类别列表.") + @GetMapping("/list") + @ResponseStatus(code = HttpStatus.OK) + public List list() { + return service.listAll().stream().map(source -> { + BizMessageCategoryVO vo = new BizMessageCategoryVO(); + BeanUtils.copyProperties(source, vo); + return vo; + }).collect(Collectors.toList()); + } - @ApiOperation("查询指定id的消息.") - @GetMapping("{id}") - @ResponseStatus(code = HttpStatus.OK) - public BizMessageCategoryVO findById(@ApiParam(value = "类别id", required = true) @PathVariable String id) { - return Optional.ofNullable(service.findById(id)).map(source -> { - BizMessageCategoryVO vo = new BizMessageCategoryVO(); - BeanUtils.copyProperties(source, vo); - return vo; - }).orElseGet(BizMessageCategoryVO::new); - } + @ApiOperation("查询指定id的消息.") + @GetMapping("{id}") + @ResponseStatus(code = HttpStatus.OK) + public BizMessageCategoryVO findById(@ApiParam(value = "类别id", required = true) @PathVariable String id) { + return Optional.ofNullable(service.findById(id)).map(source -> { + BizMessageCategoryVO vo = new BizMessageCategoryVO(); + BeanUtils.copyProperties(source, vo); + return vo; + }).orElseGet(BizMessageCategoryVO::new); + } - @ApiOperation("新郑消息类别.") - @PostMapping - @ResponseStatus(code = HttpStatus.OK) - public ResponseEntity add( - @ApiParam(value = "消息类别实体", required = true) @Validated @RequestBody BizMessageCategoryAddDTO cate) { - boolean success = Optional.ofNullable(cate).map(source -> { - BizMessageCategory entity = new BizMessageCategory(); - BeanUtils.copyProperties(source, entity); - return service.add(entity); - }).orElseGet(() -> false); + @ApiOperation("新郑消息类别.") + @PostMapping + @ResponseStatus(code = HttpStatus.OK) + public ResponseEntity add( + @ApiParam(value = "消息类别实体", required = true) @Validated @RequestBody BizMessageCategoryAddDTO cate) { + boolean success = Optional.ofNullable(cate).map(source -> { + BizMessageCategory entity = new BizMessageCategory(); + BeanUtils.copyProperties(source, entity); + return service.add(entity); + }).orElseGet(() -> false); - return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } - @ApiOperation("修改消息类别.") - @PutMapping - @ResponseStatus(code = HttpStatus.OK) - public ResponseEntity update( - @ApiParam(value = "消息类别实体", required = true) @Validated @RequestBody BizMessageCategoryUpdateDTO cate) { - boolean success = Optional.ofNullable(cate).map(source -> { - BizMessageCategory entity = new BizMessageCategory(); - BeanUtils.copyProperties(source, entity); - return service.update(entity); - }).orElseGet(() -> false); + @ApiOperation("修改消息类别.") + @PutMapping + @ResponseStatus(code = HttpStatus.OK) + public ResponseEntity update( + @ApiParam(value = "消息类别实体", required = true) @Validated @RequestBody BizMessageCategoryUpdateDTO cate) { + boolean success = Optional.ofNullable(cate).map(source -> { + BizMessageCategory entity = new BizMessageCategory(); + BeanUtils.copyProperties(source, entity); + return service.update(entity); + }).orElseGet(() -> false); - return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } - @ApiOperation("删除消息类别.") - @DeleteMapping("{id}") - @ResponseStatus(code = HttpStatus.OK) - public ResponseEntity del(@ApiParam(value = "类别id", required = true) @PathVariable String id) { - return service.del(id) ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + @ApiOperation("删除消息类别.") + @DeleteMapping("{id}") + @ResponseStatus(code = HttpStatus.OK) + public ResponseEntity del(@ApiParam(value = "类别id", required = true) @PathVariable String id) { + return service.del(id) ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 22ac44a..05ac2b8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -1,25 +1,23 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; -import java.util.Optional; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; /** * 消息查询服务 - * + * * @author ajaxfan */ @RestController @@ -27,39 +25,40 @@ import io.swagger.annotations.ApiParam; @RequestMapping("/v1/message/") public class BizMessageConsumerController { - private @Autowired BizMessageConsumerService service; + private @Autowired + BizMessageConsumerService service; - /** - * 消息概要清单 - * - * @return - */ - @ApiOperation("消息概要清单.") - @PostMapping("describeSiteMsg") - @ResponseStatus(code = HttpStatus.OK) - public IBizMessagePage describeSiteMsg( - @ApiParam(value = "分页参数", required = false) @RequestBody(required = false) PageDTO page) { - return service.listOutline(page); - } + /** + * 消息概要清单 + * + * @return + */ + @ApiOperation("消息概要清单.") + @PostMapping("describeSiteMsg") + @ResponseStatus(code = HttpStatus.OK) + public IBizMessagePage describeSiteMsg( + @ApiParam(value = "分页参数", required = false) @RequestBody(required = false) PageDTO page) { + return service.listOutline(page); + } - /** - * 消息明细 - * - * @param id - * @return - */ - @ApiOperation("消息明细查询.") - @GetMapping("describeSiteMsgDetail/{id}") - @ResponseStatus(code = HttpStatus.OK) - public DescribeSiteMsgDetailVO describeSiteMsgDetail( - @ApiParam(value = "待查询的消息id", required = true) @PathVariable("id") String id) { - return Optional.ofNullable(service.getDetailById(id)).map(source -> { - DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); - vo.setMsgId(source.getId()); - BeanUtils.copyProperties(source, vo); + /** + * 消息明细 + * + * @param id + * @return + */ + @ApiOperation("消息明细查询.") + @GetMapping("describeSiteMsgDetail/{id}") + @ResponseStatus(code = HttpStatus.OK) + public DescribeSiteMsgDetailVO describeSiteMsgDetail( + @ApiParam(value = "待查询的消息id", required = true) @PathVariable("id") String id) { + return Optional.ofNullable(service.getDetailById(id)).map(source -> { + DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); + vo.setMsgId(source.getId()); + BeanUtils.copyProperties(source, vo); - return vo; - }).orElseGet(DescribeSiteMsgDetailVO::new); - } + return vo; + }).orElseGet(DescribeSiteMsgDetailVO::new); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java index 6c60c1b..964013a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageProducerController.java @@ -1,23 +1,17 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.validation.annotation.Validated; -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.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageRawDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageProducerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; @Slf4j @Api(value = "创建消息", description = "创建消息") @@ -25,21 +19,22 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("/v1/producer/") public class BizMessageProducerController { - private @Autowired BizMessageProducerService service; + private @Autowired + BizMessageProducerService service; - @ApiOperation("生成新消息.") - @PostMapping - @ResponseStatus(code = HttpStatus.OK) - public DescribeSiteMsgDetailVO produce( - @ApiParam(value = "消息内容", required = true) @Validated @RequestBody BizMessageRawDTO raw) { - log.debug("user send raw message: {}", raw); + @ApiOperation("生成新消息.") + @PostMapping + @ResponseStatus(code = HttpStatus.OK) + public DescribeSiteMsgDetailVO produce( + @ApiParam(value = "消息内容", required = true) @Validated @RequestBody BizMessageRawDTO raw) { + log.debug("user send raw message: {}", raw); - return service.produce(raw).map(source -> { - DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); - vo.setMsgId(source.getId()); - BeanUtils.copyProperties(source, vo); - return vo; - }).orElseGet(DescribeSiteMsgDetailVO::new); - } + return service.produce(raw).map(source -> { + DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); + vo.setMsgId(source.getId()); + BeanUtils.copyProperties(source, vo); + return vo; + }).orElseGet(DescribeSiteMsgDetailVO::new); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageTemplateController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageTemplateController.java index 58fa851..2eea2fb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageTemplateController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageTemplateController.java @@ -1,98 +1,85 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -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.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageTemplateAddDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageTemplateUpdateDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageTemplate; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageTemplateService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.BizMessageTemplateVO; +import io.swagger.annotations.*; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; @RestController @Api(value = "消息模板管理", description = "消息模板管理") @RequestMapping("/v1/template/") public class BizMessageTemplateController { - private @Autowired BizMessageTemplateService service; + private @Autowired + BizMessageTemplateService service; - @ApiOperation("消息模板清单") - @GetMapping("list") - @ResponseStatus(code = HttpStatus.OK) - public List list() { - return service.listAll().stream().map(source -> { - BizMessageTemplateVO vo = new BizMessageTemplateVO(); - BeanUtils.copyProperties(source, vo); - return vo; - }).collect(Collectors.toList()); - } + @ApiOperation("消息模板清单") + @GetMapping("list") + @ResponseStatus(code = HttpStatus.OK) + public List list() { + return service.listAll().stream().map(source -> { + BizMessageTemplateVO vo = new BizMessageTemplateVO(); + BeanUtils.copyProperties(source, vo); + return vo; + }).collect(Collectors.toList()); + } - @ApiOperation("查询指定id的消息模板") - @GetMapping("{id}") - @ResponseStatus(code = HttpStatus.OK) - public BizMessageTemplateVO findById(@ApiParam(value = "消息模板id", required = true) @PathVariable("id") String id) { - return Optional.ofNullable(service.findById(id)).map(source -> { - BizMessageTemplateVO vo = new BizMessageTemplateVO(); - BeanUtils.copyProperties(source, vo); - return vo; - }).orElseGet(BizMessageTemplateVO::new); - } + @ApiOperation("查询指定id的消息模板") + @GetMapping("{id}") + @ResponseStatus(code = HttpStatus.OK) + public BizMessageTemplateVO findById(@ApiParam(value = "消息模板id", required = true) @PathVariable("id") String id) { + return Optional.ofNullable(service.findById(id)).map(source -> { + BizMessageTemplateVO vo = new BizMessageTemplateVO(); + BeanUtils.copyProperties(source, vo); + return vo; + }).orElseGet(BizMessageTemplateVO::new); + } - @ApiOperation("添加新的消息模板") - @ApiResponses(value = { @ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败") }) - @PostMapping - public ResponseEntity add(@Validated @RequestBody BizMessageTemplateAddDTO vo) { - boolean success = Optional.ofNullable(vo).map(source -> { - BizMessageTemplate dao = new BizMessageTemplate(); - BeanUtils.copyProperties(source, dao); + @ApiOperation("添加新的消息模板") + @ApiResponses(value = {@ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败")}) + @PostMapping + public ResponseEntity add(@Validated @RequestBody BizMessageTemplateAddDTO vo) { + boolean success = Optional.ofNullable(vo).map(source -> { + BizMessageTemplate dao = new BizMessageTemplate(); + BeanUtils.copyProperties(source, dao); - return service.add(dao); - }).orElseGet(() -> false); + return service.add(dao); + }).orElseGet(() -> false); - return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } - @ApiOperation("修改消息模板") - @ApiResponses(value = { @ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败") }) - @PutMapping - public ResponseEntity update(@Validated @RequestBody BizMessageTemplateUpdateDTO vo) { - boolean success = Optional.ofNullable(vo).map(source -> { - BizMessageTemplate dao = new BizMessageTemplate(); - BeanUtils.copyProperties(source, dao); + @ApiOperation("修改消息模板") + @ApiResponses(value = {@ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败")}) + @PutMapping + public ResponseEntity update(@Validated @RequestBody BizMessageTemplateUpdateDTO vo) { + boolean success = Optional.ofNullable(vo).map(source -> { + BizMessageTemplate dao = new BizMessageTemplate(); + BeanUtils.copyProperties(source, dao); - return service.update(dao); - }).orElseGet(() -> false); + return service.update(dao); + }).orElseGet(() -> false); - return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + return success ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } - @ApiOperation("删除消息模板") - @ApiResponses(value = { @ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败") }) - @DeleteMapping("{id}") - public ResponseEntity deleteById(@ApiParam(value = "消息模板id", required = true) @PathVariable String id) { - return service.del(id) ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); - } + @ApiOperation("删除消息模板") + @ApiResponses(value = {@ApiResponse(code = 200, message = "执行成功"), @ApiResponse(code = 400, message = "执行失败")}) + @DeleteMapping("{id}") + public ResponseEntity deleteById(@ApiParam(value = "消息模板id", required = true) @PathVariable String id) { + return service.del(id) ? ResponseEntity.ok().build() : ResponseEntity.badRequest().build(); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index b504edb..bb6325d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -1,13 +1,12 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import org.apache.ibatis.annotations.Param; public interface BizMessageMapper extends BaseMapper { - IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); + IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 1d6cdc6..40fec46 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -3,19 +3,19 @@ \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryAddDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryAddDTO.java index fe7e54a..3bc8db6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryAddDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryAddDTO.java @@ -1,24 +1,24 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; -import javax.validation.constraints.NotEmpty; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @ApiModel("新增类别实体") public class BizMessageCategoryAddDTO { - @ApiModelProperty(required = true, value = "类别编码") - @NotEmpty(message = "类别编码不能为空") - private String code; + @ApiModelProperty(required = true, value = "类别编码") + @NotEmpty(message = "类别编码不能为空") + private String code; - @ApiModelProperty(required = true, value = "类别名称") - @NotEmpty(message = "类别名称不能为空") - private String name; + @ApiModelProperty(required = true, value = "类别名称") + @NotEmpty(message = "类别名称不能为空") + private String name; - @ApiModelProperty("描述") - private String remark; + @ApiModelProperty("描述") + private String remark; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryUpdateDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryUpdateDTO.java index 4097ff4..026f606 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryUpdateDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageCategoryUpdateDTO.java @@ -1,28 +1,28 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; -import javax.validation.constraints.NotEmpty; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @ApiModel("编辑类别实体") public class BizMessageCategoryUpdateDTO { - @ApiModelProperty(required = true, value = "类别id") - @NotEmpty(message = "类别id不能为空") - private String id; + @ApiModelProperty(required = true, value = "类别id") + @NotEmpty(message = "类别id不能为空") + private String id; - @ApiModelProperty(required = true, value = "类别编码") - @NotEmpty(message = "类别编码不能为空") - private String code; + @ApiModelProperty(required = true, value = "类别编码") + @NotEmpty(message = "类别编码不能为空") + private String code; - @ApiModelProperty(required = true, value = "类别名称") - @NotEmpty(message = "类别名称不能为空") - private String name; + @ApiModelProperty(required = true, value = "类别名称") + @NotEmpty(message = "类别名称不能为空") + private String name; - @ApiModelProperty("描述") - private String remark; + @ApiModelProperty("描述") + private String remark; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java index f7e7d91..f5867bc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageRawDTO.java @@ -1,45 +1,44 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; -import java.util.List; -import java.util.Map; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; + /** * 消息原型 - * + * * @author ajaxfan */ @Data @ApiModel("消息实体") public class BizMessageRawDTO { - @ApiModelProperty(required = true, value = "消息标题") - @NotEmpty(message = "消息标题不能为空") - private String title; + @ApiModelProperty(required = true, value = "消息标题") + @NotEmpty(message = "消息标题不能为空") + private String title; - @ApiModelProperty(required = true, value = "消息类别") - @NotEmpty(message = "消息类别不能为空") - private String category; + @ApiModelProperty(required = true, value = "消息类别") + @NotEmpty(message = "消息类别不能为空") + private String category; - @ApiModelProperty(required = true, value = "消息模板编码") - @NotEmpty(message = "消息模板编码不能为空") - private String templateCode; + @ApiModelProperty(required = true, value = "消息模板编码") + @NotEmpty(message = "消息模板编码不能为空") + private String templateCode; - @ApiModelProperty(required = true, value = "消息内容对象") - @NotNull(message = "消息内容对象不能为空") - private Map body; + @ApiModelProperty(required = true, value = "消息内容对象") + @NotNull(message = "消息内容对象不能为空") + private Map body; - @ApiModelProperty(required = true, value = "消息附加参数") - @NotNull(message = "消息附加参数不能为空") - private Map extra; + @ApiModelProperty(required = true, value = "消息附加参数") + @NotNull(message = "消息附加参数不能为空") + private Map extra; - @ApiModelProperty(required = true, value = "授权用户列表") - private List users; + @ApiModelProperty(required = true, value = "授权用户列表") + private List users; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateAddDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateAddDTO.java index 2f930a8..cd35136 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateAddDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateAddDTO.java @@ -1,27 +1,27 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; -import javax.validation.constraints.NotEmpty; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @ApiModel("消息模板新增实体") public class BizMessageTemplateAddDTO { - @ApiModelProperty(required = true, value = "模板编码") - @NotEmpty(message = "模板编码不能为空") - private String code; + @ApiModelProperty(required = true, value = "模板编码") + @NotEmpty(message = "模板编码不能为空") + private String code; - @ApiModelProperty(required = true, value = "模板内容") - @NotEmpty(message = "模板内容不能为空") - private String body; + @ApiModelProperty(required = true, value = "模板内容") + @NotEmpty(message = "模板内容不能为空") + private String body; - @ApiModelProperty("路由") - private String router; + @ApiModelProperty("路由") + private String router; - @ApiModelProperty("描述") - private String remark; + @ApiModelProperty("描述") + private String remark; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateUpdateDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateUpdateDTO.java index 1e5aebb..2f7fb1e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateUpdateDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/BizMessageTemplateUpdateDTO.java @@ -1,31 +1,31 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; -import javax.validation.constraints.NotEmpty; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @ApiModel("消息模板变更实体") public class BizMessageTemplateUpdateDTO { - @ApiModelProperty(required = true, value = "模板id") - @NotEmpty(message = "模板id不能为空") - private String id; + @ApiModelProperty(required = true, value = "模板id") + @NotEmpty(message = "模板id不能为空") + private String id; - @ApiModelProperty(required = true, value = "模板编码") - @NotEmpty(message = "模板编码不能为空") - private String code; + @ApiModelProperty(required = true, value = "模板编码") + @NotEmpty(message = "模板编码不能为空") + private String code; - @ApiModelProperty(required = true, value = "模板内容") - @NotEmpty(message = "模板内容不能为空") - private String body; + @ApiModelProperty(required = true, value = "模板内容") + @NotEmpty(message = "模板内容不能为空") + private String body; - @ApiModelProperty("路由") - private String router; + @ApiModelProperty("路由") + private String router; - @ApiModelProperty("描述") - private String remark; + @ApiModelProperty("描述") + private String remark; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java index 023f147..91af3da 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java @@ -5,25 +5,25 @@ import lombok.Data; /** * 分页明细 - * + * * @author Ajaxfan */ @Data public class PageDTO { - @ApiModelProperty(required = false, value = "当前页(默认1)") - private int current; + @ApiModelProperty(required = false, value = "当前页(默认1)") + private int current; - @ApiModelProperty(required = false, value = "页码(默认1)") - private int pageNo; + @ApiModelProperty(required = false, value = "页码(默认1)") + private int pageNo; - @ApiModelProperty(required = false, value = "单页数量(默认15)") - private int pageSize; + @ApiModelProperty(required = false, value = "单页数量(默认15)") + private int pageSize; - public PageDTO() { - this.current = 1; - this.pageNo = 1; - this.pageSize = 15; - } + public PageDTO() { + this.current = 1; + this.pageNo = 1; + this.pageSize = 15; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java index 238b8e0..d539b07 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java @@ -1,24 +1,23 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; -import java.sql.Timestamp; - import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; +import java.sql.Timestamp; + @Data public class BizMessage { - @TableId - private String id; - private String title; - private String category; - private String content; - private String url; - private String params; - private Timestamp createtime; + @TableId + private String id; + private String title; + private String category; + private String content; + private String url; + private String params; + private Timestamp createtime; - /* 该值为1则标识开启授权控制,只有授权列表( biz_message_authorize )内的用户可见 */ - private Integer authorize; + /* 该值为1则标识开启授权控制,只有授权列表( biz_message_authorize )内的用户可见 */ + private Integer authorize; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java index 22187a0..56f543b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class BizMessageAuthorize { - private String userId; - private String messageId; + private String userId; + private String messageId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageCategory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageCategory.java index e72608a..5642c15 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageCategory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageCategory.java @@ -1,19 +1,18 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; -import java.sql.Timestamp; - import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; +import java.sql.Timestamp; + @Data public class BizMessageCategory { - @TableId - private String id; - private String code; - private String name; - private String remark; - private Timestamp createtime; + @TableId + private String id; + private String code; + private String name; + private String remark; + private Timestamp createtime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java index 1508876..0469787 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageTemplate.java @@ -1,23 +1,22 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; -import java.sql.Timestamp; - import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.experimental.Accessors; +import java.sql.Timestamp; + @Data @Accessors(chain = true) public class BizMessageTemplate { - @TableId - private String id; - private String code; - private String body; - private String remark; - private String router; - private Timestamp createtime; - private Timestamp updatetime; + @TableId + private String id; + private String code; + private String body; + private String remark; + private String router; + private Timestamp createtime; + private Timestamp updatetime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/BizMessagePage.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/BizMessagePage.java index 0366eda..931309f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/BizMessagePage.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/BizMessagePage.java @@ -1,13 +1,9 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis; -import org.apache.poi.ss.formula.functions.T; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.NoArgsConstructor; - public class BizMessagePage extends Page implements IBizMessagePage { - private static final long serialVersionUID = -3820693837182317407L; + private static final long serialVersionUID = -3820693837182317407L; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/IBizMessagePage.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/IBizMessagePage.java index dc1374d..c0611b9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/IBizMessagePage.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/IBizMessagePage.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; public interface IBizMessagePage extends IPage { - /** - * @return 为了兼容前端的组件 - */ - default int getCode() { - return 200; - } + /** + * @return 为了兼容前端的组件 + */ + default int getCode() { + return 200; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageCategoryService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageCategoryService.java index 9aa1931..ee2e00f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageCategoryService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageCategoryService.java @@ -1,19 +1,19 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; -import java.util.List; - import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageCategory; +import java.util.List; + public interface BizMessageCategoryService { - List listAll(); + List listAll(); - BizMessageCategory findById(String id); + BizMessageCategory findById(String id); - boolean add(BizMessageCategory cate); + boolean add(BizMessageCategory cate); - boolean update(BizMessageCategory cate); + boolean update(BizMessageCategory cate); - boolean del(String id); + boolean del(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index b0c3dc2..087bc0e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -7,8 +7,8 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; public interface BizMessageConsumerService { - IBizMessagePage listOutline(PageDTO page); + IBizMessagePage listOutline(PageDTO page); - BizMessage getDetailById(String id); + BizMessage getDetailById(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java index 175a008..0efd5de 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageProducerService.java @@ -1,12 +1,12 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; -import java.util.Optional; - import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.BizMessageRawDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import java.util.Optional; + public interface BizMessageProducerService { - Optional produce(BizMessageRawDTO messageRaw); + Optional produce(BizMessageRawDTO messageRaw); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageTemplateService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageTemplateService.java index 85299c8..d372c69 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageTemplateService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageTemplateService.java @@ -1,19 +1,19 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; -import java.util.List; - import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageTemplate; +import java.util.List; + public interface BizMessageTemplateService { - BizMessageTemplate findById(String id); + BizMessageTemplate findById(String id); - List listAll(); + List listAll(); - boolean add(BizMessageTemplate template); + boolean add(BizMessageTemplate template); - boolean update(BizMessageTemplate tempalte); + boolean update(BizMessageTemplate tempalte); - boolean del(String id); + boolean del(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageCategoryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageCategoryServiceImpl.java index 3b41bac..a48a827 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageCategoryServiceImpl.java @@ -1,48 +1,48 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageCategoryMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageCategory; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageCategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 消息类别信息维护 - * + * * @author Ajaxfan */ @Service public class BizMessageCategoryServiceImpl implements BizMessageCategoryService { - private @Autowired BizMessageCategoryMapper mapper; + private @Autowired + BizMessageCategoryMapper mapper; - @Override - public List listAll() { - return mapper.selectList(new QueryWrapper()); - } + @Override + public List listAll() { + return mapper.selectList(new QueryWrapper()); + } - @Override - public BizMessageCategory findById(String id) { - return mapper.selectById(id); - } + @Override + public BizMessageCategory findById(String id) { + return mapper.selectById(id); + } - @Override - public boolean add(BizMessageCategory cate) { - return mapper.insert(cate) > 0; - } + @Override + public boolean add(BizMessageCategory cate) { + return mapper.insert(cate) > 0; + } - @Override - public boolean update(BizMessageCategory cate) { - return mapper.updateById(cate) > 0; - } + @Override + public boolean update(BizMessageCategory cate) { + return mapper.updateById(cate) > 0; + } - @Override - public boolean del(String id) { - return mapper.deleteById(id) > 0; - } + @Override + public boolean del(String id) { + return mapper.deleteById(id) > 0; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index 40b3de5..46bf4b8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -1,12 +1,5 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service.impl; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; @@ -17,67 +10,75 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; +import java.util.stream.Collectors; /** * 消息查询服务 - * + * * @author ajaxfan */ @Service public class BizMessageConsumerServiceImpl implements BizMessageConsumerService { - private @Autowired BizMessageMapper mapper; - private @Autowired IBaseCacheUserService service; + private @Autowired + BizMessageMapper mapper; + private @Autowired + IBaseCacheUserService service; - /** - * 消息概要列表 - * - * @return - */ - @Override - public IBizMessagePage listOutline(PageDTO page) { - page = createPageCondition(page); - - IPage pageEntity = mapper.findMessage(new Page(page.getPageNo(), page.getPageSize()), - service.getCacheUser().getUserId()); - - // DAT -> VO 转换 - IBizMessagePage result = new BizMessagePage<>(); - BeanUtils.copyProperties(pageEntity, result, "records"); - result.setRecords(pageEntity.getRecords().stream().map(source -> { - DescribeSiteMsgVO vo = new DescribeSiteMsgVO(); - vo.setMsgId(source.getId()); - BeanUtils.copyProperties(source, vo); + /** + * 消息概要列表 + * + * @return + */ + @Override + public IBizMessagePage listOutline(PageDTO page) { + page = createPageCondition(page); - return vo; - }).collect(Collectors.toList())); + IPage pageEntity = mapper.findMessage(new Page(page.getPageNo(), page.getPageSize()), + service.getCacheUser().getUserId()); - return result; - } + // DAT -> VO 转换 + IBizMessagePage result = new BizMessagePage<>(); + BeanUtils.copyProperties(pageEntity, result, "records"); + result.setRecords(pageEntity.getRecords().stream().map(source -> { + DescribeSiteMsgVO vo = new DescribeSiteMsgVO(); + vo.setMsgId(source.getId()); + BeanUtils.copyProperties(source, vo); - /** - * 消息详情 - * - * @param id - * @return - */ - @Override - public BizMessage getDetailById(String id) { - return mapper.selectById(id); - } + return vo; + }).collect(Collectors.toList())); - /** - * @param page - * @return - */ - private PageDTO createPageCondition(PageDTO page) { - return Optional.ofNullable(page).map(p -> { - p.setCurrent(Math.max(1, p.getCurrent())); - p.setPageNo(Math.max(1, p.getPageNo())); - p.setPageSize(p.getPageSize() == 0 ? 15 : p.getPageSize()); + return result; + } - return p; - }).orElseGet(PageDTO::new); - } + /** + * 消息详情 + * + * @param id + * @return + */ + @Override + public BizMessage getDetailById(String id) { + return mapper.selectById(id); + } + + /** + * @param page + * @return + */ + private PageDTO createPageCondition(PageDTO page) { + return Optional.ofNullable(page).map(p -> { + p.setCurrent(Math.max(1, p.getCurrent())); + p.setPageNo(Math.max(1, p.getPageNo())); + p.setPageSize(p.getPageSize() == 0 ? 15 : p.getPageSize()); + + return p; + }).orElseGet(PageDTO::new); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java index 4095a11..f797bf5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java @@ -1,18 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service.impl; -import java.io.IOException; -import java.io.StringWriter; -import java.util.Map; -import java.util.Optional; - -import org.apache.commons.lang.StringUtils; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - +import cn.hutool.core.lang.Snowflake; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageAuthorizeMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageCategoryMapper; @@ -26,132 +14,147 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageTemplate; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageProducerService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - -import cn.hutool.core.lang.Snowflake; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Map; +import java.util.Optional; /** * 消息生产服务 - * + * * @author ajaxfan */ @Slf4j @Service public class BizMessageProducerServiceImpl implements BizMessageProducerService { - private @Autowired BizMessageMapper messageMapper; - private @Autowired BizMessageTemplateMapper templateMapper; - private @Autowired BizMessageAuthorizeMapper authorizeMapper; - private @Autowired BizMessageCategoryMapper categoryMapper; + private @Autowired + BizMessageMapper messageMapper; + private @Autowired + BizMessageTemplateMapper templateMapper; + private @Autowired + BizMessageAuthorizeMapper authorizeMapper; + private @Autowired + BizMessageCategoryMapper categoryMapper; - private @Autowired Snowflake snowflakeGenerator; + private @Autowired + Snowflake snowflakeGenerator; - private ObjectMapper objectMapper = new ObjectMapper(); + private ObjectMapper objectMapper = new ObjectMapper(); - /** - * @param messageRaw - * @return - */ - @Override - public Optional produce(BizMessageRawDTO messageRaw) { - return Optional.ofNullable(messageRaw).map(this::evaluate).map(message -> { - log.debug("ready to save: {}", message); - return messageMapper.insert(message) > 0 ? message : null; - }); - } + /** + * @param messageRaw + * @return + */ + @Override + public Optional produce(BizMessageRawDTO messageRaw) { + return Optional.ofNullable(messageRaw).map(this::evaluate).map(message -> { + log.debug("ready to save: {}", message); + return messageMapper.insert(message) > 0 ? message : null; + }); + } - /** - * 生成消息 - * - * @param messageRaw - * @return - */ - private BizMessage evaluate(BizMessageRawDTO messageRaw) { - BizMessageTemplate dao = getTemplate(messageRaw.getTemplateCode()); - Assert.notNull(dao, "无效的消息模板编码"); + /** + * 生成消息 + * + * @param messageRaw + * @return + */ + private BizMessage evaluate(BizMessageRawDTO messageRaw) { + BizMessageTemplate dao = getTemplate(messageRaw.getTemplateCode()); + Assert.notNull(dao, "无效的消息模板编码"); - log.debug("load template: {} by code: {}", dao, messageRaw.getTemplateCode()); + log.debug("load template: {} by code: {}", dao, messageRaw.getTemplateCode()); - final String messageId = snowflakeGenerator.nextIdStr(); - log.debug("generate message id: {}", messageId); + final String messageId = snowflakeGenerator.nextIdStr(); + log.debug("generate message id: {}", messageId); - BizMessage bizmessage = new BizMessage(); - BeanUtils.copyProperties(messageRaw, bizmessage); - bizmessage.setId(messageId); - bizmessage.setCategory(convertCodeToName(messageRaw.getCategory())); - bizmessage.setContent(fill(dao.getBody(), messageRaw.getBody())); - bizmessage.setUrl(fill(dao.getRouter(), messageRaw.getExtra())); - bizmessage.setParams(toJson(messageRaw.getExtra())); + BizMessage bizmessage = new BizMessage(); + BeanUtils.copyProperties(messageRaw, bizmessage); + bizmessage.setId(messageId); + bizmessage.setCategory(convertCodeToName(messageRaw.getCategory())); + bizmessage.setContent(fill(dao.getBody(), messageRaw.getBody())); + bizmessage.setUrl(fill(dao.getRouter(), messageRaw.getExtra())); + bizmessage.setParams(toJson(messageRaw.getExtra())); - Optional.ofNullable(messageRaw.getUsers()).ifPresent(users -> { - log.debug("if user list {} is not emtpy, then grant current message to them.", users); - bizmessage.setAuthorize(Math.min(1, users.size())); + Optional.ofNullable(messageRaw.getUsers()).ifPresent(users -> { + log.debug("if user list {} is not emtpy, then grant current message to them.", users); + bizmessage.setAuthorize(Math.min(1, users.size())); - log.debug("grant message [{}] to users", messageId); - users.forEach(userid -> authorizeMapper.insert(new BizMessageAuthorize(userid, messageId))); - }); + log.debug("grant message [{}] to users", messageId); + users.forEach(userid -> authorizeMapper.insert(new BizMessageAuthorize(userid, messageId))); + }); - return bizmessage; - } + return bizmessage; + } - /** - * 消息类别的的code转换为对应的名字 - * - * @param category - * @return - */ - private String convertCodeToName(final String code) { - BizMessageCategory entity = categoryMapper - .selectOne(Wrappers.lambdaQuery().eq(BizMessageCategory::getCode, code)); - log.debug("query category record {} by code {}", entity, code); + /** + * 消息类别的的code转换为对应的名字 + * + * @param category + * @return + */ + private String convertCodeToName(final String code) { + BizMessageCategory entity = categoryMapper + .selectOne(Wrappers.lambdaQuery().eq(BizMessageCategory::getCode, code)); + log.debug("query category record {} by code {}", entity, code); - return Optional.ofNullable(entity).map(source -> source.getName()).orElseGet(() -> code); - } + return Optional.ofNullable(entity).map(source -> source.getName()).orElseGet(() -> code); + } - /** - * 获取模板对象 - * - * @param messageRaw - * @return - */ - private BizMessageTemplate getTemplate(final String code) { - return templateMapper - .selectOne(Wrappers.lambdaQuery().eq(BizMessageTemplate::getCode, code)); - } + /** + * 获取模板对象 + * + * @param messageRaw + * @return + */ + private BizMessageTemplate getTemplate(final String code) { + return templateMapper + .selectOne(Wrappers.lambdaQuery().eq(BizMessageTemplate::getCode, code)); + } - /** - * 填充模板 - * - * @param messageObj - * @param body - * @return - */ - private String fill(String tempalte, Map map) { - return Optional.ofNullable(tempalte).map(source -> { - log.debug("message body tempalte: {}", tempalte); - try (StringWriter out = new StringWriter()) { - log.debug("template engine receive: {}, generate message: {}", map, out); - Velocity.evaluate(new VelocityContext(map), out, "log.chinaunicom", tempalte); + /** + * 填充模板 + * + * @param messageObj + * @param body + * @return + */ + private String fill(String tempalte, Map map) { + return Optional.ofNullable(tempalte).map(source -> { + log.debug("message body tempalte: {}", tempalte); + try (StringWriter out = new StringWriter()) { + log.debug("template engine receive: {}, generate message: {}", map, out); + Velocity.evaluate(new VelocityContext(map), out, "log.chinaunicom", tempalte); - return out.toString(); - } catch (IOException e) { - log.error(e.getMessage()); - } - return StringUtils.EMPTY; - }).orElseGet(() -> StringUtils.EMPTY); - } + return out.toString(); + } catch (IOException e) { + log.error(e.getMessage()); + } + return StringUtils.EMPTY; + }).orElseGet(() -> StringUtils.EMPTY); + } - /** - * @param obj - * @return - */ - private String toJson(Map obj) { - try { - return objectMapper.writeValueAsString(obj); - } catch (JsonProcessingException e) { - log.error(e.getMessage()); - } - return StringUtils.EMPTY; - } + /** + * @param obj + * @return + */ + private String toJson(Map obj) { + try { + return objectMapper.writeValueAsString(obj); + } catch (JsonProcessingException e) { + log.error(e.getMessage()); + } + return StringUtils.EMPTY; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageTemplateServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageTemplateServiceImpl.java index 48fb398..609d921 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageTemplateServiceImpl.java @@ -1,44 +1,44 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service.impl; -import java.sql.Timestamp; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageTemplateMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageTemplate; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.sql.Timestamp; +import java.util.List; @Service public class BizMessageTemplateServiceImpl implements BizMessageTemplateService { - private @Autowired BizMessageTemplateMapper mapper; + private @Autowired + BizMessageTemplateMapper mapper; - @Override - public BizMessageTemplate findById(String id) { - return mapper.selectById(id); - } + @Override + public BizMessageTemplate findById(String id) { + return mapper.selectById(id); + } - @Override - public List listAll() { - return mapper.selectList(new QueryWrapper()); - } + @Override + public List listAll() { + return mapper.selectList(new QueryWrapper()); + } - @Override - public boolean add(BizMessageTemplate template) { - return mapper.insert(template) > 0; - } + @Override + public boolean add(BizMessageTemplate template) { + return mapper.insert(template) > 0; + } - @Override - public boolean update(BizMessageTemplate tempalte) { - return mapper.updateById(tempalte.setUpdatetime(new Timestamp(System.currentTimeMillis()))) > 0; - } + @Override + public boolean update(BizMessageTemplate tempalte) { + return mapper.updateById(tempalte.setUpdatetime(new Timestamp(System.currentTimeMillis()))) > 0; + } - @Override - public boolean del(String id) { - return mapper.deleteById(id) > 0; - } + @Override + public boolean del(String id) { + return mapper.deleteById(id) > 0; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageCategoryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageCategoryVO.java index 6788bfa..b9eeb19 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageCategoryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageCategoryVO.java @@ -1,22 +1,21 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.vo; -import java.sql.Timestamp; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; - import lombok.Data; +import java.sql.Timestamp; + @Data @JsonInclude(value = Include.NON_NULL) public class BizMessageCategoryVO { - private String id; - private String code; - private String name; - private String remark; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createtime; + private String id; + private String code; + private String name; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createtime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageTemplateVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageTemplateVO.java index 0b5b859..28d9044 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageTemplateVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/BizMessageTemplateVO.java @@ -1,25 +1,24 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.vo; -import java.sql.Timestamp; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; - import lombok.Data; +import java.sql.Timestamp; + @Data @JsonInclude(value = Include.NON_NULL) public class BizMessageTemplateVO { - private String id; - private String code; - private String body; - private String router; - private String remark; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createtime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp updatetime; + private String id; + private String code; + private String body; + private String router; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createtime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp updatetime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java index 5f99489..5b9d27e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java @@ -1,30 +1,29 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.vo; -import java.sql.Timestamp; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; - import lombok.Data; +import java.sql.Timestamp; + /** * 消息详情 - * + * * @author ajaxfan */ @Data @JsonInclude(value = Include.NON_NULL) public class DescribeSiteMsgDetailVO { - private String msgId; - private String title; - private String category; - private String content; - private String url; - private String params; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createtime; + private String msgId; + private String title; + private String category; + private String content; + private String url; + private String params; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createtime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java index d89938f..913c68b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java @@ -1,23 +1,22 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.vo; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.sql.Timestamp; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; - /** * 消息概要 - * + * * @author ajaxfan */ @Data public class DescribeSiteMsgVO { - private String msgId; - private String title; - private String category; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createtime; + private String msgId; + private String title; + private String category; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createtime; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveFileReturnVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveFileReturnVO.java deleted file mode 100644 index cd7c6d7..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveFileReturnVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 项目标段归档接口返回调用 - * @author daixc - * @date 2020/12/14 - */ -@Data -@Accessors(chain = true) -@ApiModel("项目标段归档接口返回实体") -public class ArchiveFileReturnVO { - - @ApiModelProperty(value = "附件组ID") - @JsonSerialize(using = ToStringSerializer.class) - private String businessFileId; - - @ApiModelProperty(value = "评审室ID") - private String assessRoomId; - - @ApiModelProperty(value = "附件名称") - private String archiveFileName; - - @ApiModelProperty(value = "供应商名称") - private String supplierName; - - @ApiModelProperty(value = "附件路径") - private String archiveFileUrl; - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveLink.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveLink.java deleted file mode 100644 index fe97fd0..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ArchiveLink.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 实体类 ArchiveLink - * - * @author daixc - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "biz_archive_link", autoResultMap = true) -public class ArchiveLink implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号") - private String id; - - /** - * 归档流程编号 - */ - @ApiModelProperty(value = "归档环节编号") - private String archiveFlowId; - - /** - * 归档环节编号 - */ - @ApiModelProperty(value = "归档环节编号") - private String archiveLinkId; - - /** - * 归档环节名称(文档目录) - */ - @ApiModelProperty(value = "归档环节名称") - private String archiveLinkName; - - /** - * 文档目录ID - */ - @ApiModelProperty(value = "文档目录ID") - private String archiveDirectory; - - /** - * 文档目录名称 - */ - @ApiModelProperty(value = "文档目录名称") - private String fileTypeName; - - /** - * 调用方法路径 - */ - @ApiModelProperty(value = "调用方法路径") - private String methodUrl; - - @ApiModelProperty(value = "调用方法名称") - private String methodName; - - /** - * 是否可以编辑 - */ - @ApiModelProperty(value = "是否可以编辑 0 不需要增加供应商名称 1 需要") - private String isUpload; - - @ApiModelProperty(value = "是否是附件 0 附件文件(文档中心) 1 调用接口下载文件") - private String isFile; - - @ApiModelProperty(value = "下载附件地址") - private String downloadUrl; - - @ApiModelProperty(value = "是否包含轮次") - private String isContainsRound; - - - public String getMethodUrlMethod() { - return getMethodUrl()+getMethodName(); - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java deleted file mode 100644 index 0505d1b..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * 评标详细评审表 - *

- * - * @author dino - * @since 2020-11-19 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="BidEvalDetail对象", description="评标详细评审表") -@TableName(value = "biz_rsms_bid_eval_detail",autoResultMap = true) -public class BidEvalDetail extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId - @ApiModelProperty(value = "编号") - @JsonSerialize(using = ToStringSerializer.class) - private String id; - - @ApiModelProperty(value = "报名表id(biz_bid_register)") - @JsonSerialize(using = ToStringSerializer.class) - private String supplierRegisterId; - - @ApiModelProperty(value = "评标主表ID(biz_eval_rvw)") - @JsonSerialize(using = ToStringSerializer.class) - private String bidEvalId; - - @ApiModelProperty(value = "评标类别表ID(biz_rsms_bid_eval_category)") - @JsonSerialize(using = ToStringSerializer.class) - private String bidEvalCategoryId; - - @ApiModelProperty(value = "评审配置类别表ID(biz_rsms_review_config_category)") - @JsonSerialize(using = ToStringSerializer.class) - private String categoryId; - - @ApiModelProperty(value = "详审项类别:0:报价;1:商务;2:技术;4:工程报价 ;5:服务。初审项类别:0:形式评审;1:资格审查项;2:响应性评审;3:商务审查项;4: 技术审查项;5: 服务审查项;6: 其他审查项") - private String category; - - @ApiModelProperty(value = "评分细则表ID(biz_rsms_review_config_detail)") - @JsonSerialize(using = ToStringSerializer.class) - private String detailId; - - @ApiModelProperty(value = "详细评分标准ID(biz_rsms_bid_eval_standard)") - @JsonSerialize(using = ToStringSerializer.class) - private String standardId; - - @ApiModelProperty(value = "结果值:初审1:合格;2不合格。详审:合计") - private String resultValue; - - @ApiModelProperty(value = "评分详情") - private String detailValue; - - @ApiModelProperty(value = "权重") - private Float weights; - - @ApiModelProperty(value = "备注") - private String remarks; - - - - - public static long getSerialVersionUID() { - return serialVersionUID; - } - - 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 getBidEvalId() { - return bidEvalId; - } - - public void setBidEvalId(String bidEvalId) { - this.bidEvalId = bidEvalId; - } - - public String getBidEvalCategoryId() { - return bidEvalCategoryId; - } - - public void setBidEvalCategoryId(String bidEvalCategoryId) { - this.bidEvalCategoryId = bidEvalCategoryId; - } - - public String getCategoryId() { - return categoryId; - } - - public void setCategoryId(String categoryId) { - this.categoryId = categoryId; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getDetailId() { - return detailId; - } - - public void setDetailId(String detailId) { - this.detailId = detailId; - } - - public String getStandardId() { - return standardId; - } - - public void setStandardId(String standardId) { - this.standardId = standardId; - } - - public String getResultValue() { - return resultValue; - } - - public void setResultValue(String resultValue) { - this.resultValue = resultValue; - } - - public String getDetailValue() { - return detailValue; - } - - public void setDetailValue(String detailValue) { - this.detailValue = detailValue; - } - - public Float getWeights() { - return weights; - } - - public void setWeights(Float weights) { - this.weights = weights; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java deleted file mode 100644 index 86f911a..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 评标详细评审表 - *

- * - * @author dino - * @since 2020-11-19 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="BidEvalDetailDTO对象", description="评标详细评审表DTO") -public class BidEvalDetailDTO extends BidEvalDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "评审轮次ID") - @JsonSerialize(using = ToStringSerializer.class) - private String reviewTurnId; - - @ApiModelProperty(value = "轮次数") - private Integer reviewTurnSort; - - @ApiModelProperty(value = "评审室Id") - @JsonSerialize(using = ToStringSerializer.class) - private String assessRoomId; - - @ApiModelProperty(value = "评审室序号") - @JsonSerialize(using = ToStringSerializer.class) - private Integer assessRoomSort; - - @ApiModelProperty(value = "评审类型(1:初审,2:详细评审)") - private String reviewType; - - @JsonInclude(value = JsonInclude.Include.NON_EMPTY) - @ApiModelProperty(value = "供应商ID") - private List supplierRegisterIds; - - - public static long getSerialversionuid() { - return serialVersionUID; - } - - 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; - } - - 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 getReviewType() { - return reviewType; - } - - public void setReviewType(String reviewType) { - this.reviewType = reviewType; - } - - public List getSupplierRegisterIds() { - return supplierRegisterIds; - } - - public void setSupplierRegisterIds(List supplierRegisterIds) { - this.supplierRegisterIds = supplierRegisterIds; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java deleted file mode 100644 index 4e66274..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizBidOpenroom.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * 实体类 BizBidOpenroom - * - * @auto.generated - */ -@Data -@Accessors(chain = true) -@TableName(value = "biz_bid_openroom", autoResultMap = true) -public class BizBidOpenroom extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 开标室id - */ - private String id; - /** - * 评审室id - */ - private String assessRoomId; - /** - * 评审室类型 1、资审 2、评审 - */ - private Integer roomType; - - /** - * 评审轮次id - */ - private String turnId; - - /** - * 轮次 - */ - private String turnSort; - - /** - * 项目id - */ - private String projectId; - - /** - * 项目名称 - */ - private String projectName; - - /** - * 项目编号 - */ - private String projectNo; - - /** - * 标段id - */ - private String sectionId; - - /** - * 标段名称 - */ - private String sectionName; - - /** - * 标段编号 - */ - private String sectionNo; - /** - * 开标室状态 0未开标 1、开标 - */ - private String roomState; - /** - * 解封状态(0、为解封 1、解封) - */ - private String unsealState; - - /** - * 开标室备注 - */ - private String remarks; - - /** - * 开标时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime opingTime; - /** - * 开标时限 0 未设置 - */ - private String opingTimeLimit; - /** - * 开标结束时间 通过时限计算 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime opingEndTime; - - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java index a632673..deea169 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java @@ -1,7 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.export.bean; +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; @@ -52,6 +52,12 @@ public class BizExportDict implements Serializable { @ApiModelProperty(value = "") private Integer level; + /** + * + */ + @ApiModelProperty(value = "") + private Integer queryType; + /** * 使能:0、不可用,1、可用 */ @@ -64,5 +70,12 @@ public class BizExportDict implements Serializable { @ApiModelProperty(value = "") private String methodDict; + /** + * + */ + @TableField(exist = false) + @ApiModelProperty(value = "是否可点击") + private boolean onClick; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java deleted file mode 100644 index d24d545..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizSupplierRegister.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; -import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 实体类 BizSupplierRegister - * - * @auto.generated - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "BizSupplierRegister对象", description = "供应商报名登记表") -public class BizSupplierRegister extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - - - /** - * 机构名称 - */ - @ApiModelProperty(value = "机构名称") - private String companyName; - - - /** - * 投标人姓名 - */ - @ApiModelProperty(value = "投标人姓名") - private String bidUserName; - - /** - * 联系人名称 - */ - @ApiModelProperty(value = "联系人名称") - private String contactName; - - - /** - * 签字确认时间 - */ - - @ApiModelProperty(value = "签字确认时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime signTime; - - - private String newPrice; - - /** - * 下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件] - */ - @ApiModelProperty(value = "下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件]") - private String downloadStatus; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/CbpsExportData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/CbpsExportData.java new file mode 100644 index 0000000..c07cecf --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/CbpsExportData.java @@ -0,0 +1,31 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Accessors(chain = true) +public class CbpsExportData { + + private String index; + + /** + * 评审项名称 + */ + private String scoreItem; + + /** + * 审查标准 + */ + private String rvwStandard; + + /** + * 得分 + */ + private List scores = new ArrayList<>(); + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParam.java similarity index 78% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParam.java index 5695a62..d75c803 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParam.java @@ -5,19 +5,23 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 参数 */ @Data @Accessors(chain = true) @ApiModel("参数") -public class ExportParame { +public class ExportParam { + + private String id; private String assessRoomId; private String reviewTurnId; - private String reviewTurnSort; + private Integer reviewTurnSort; private String projectId; @@ -27,6 +31,6 @@ public class ExportParame { @ApiModelProperty(value = "类型id") private String reviewType; - + private List userList; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportTableData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportTableData.java new file mode 100644 index 0000000..6ec7272 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportTableData.java @@ -0,0 +1,33 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + + +import com.deepoove.poi.data.CellRenderData; +import com.deepoove.poi.data.MergeCellRule; +import com.deepoove.poi.data.RowRenderData; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + + +@Data +@Accessors(chain = true) +public class ExportTableData implements Serializable { + + private static final long serialVersionUID = 1L; + //表头的循环数据 + private List cells; + + //行单元格合并 + private MergeCellRule cellMerge; + + + //行的循环 + private List rows; + + //列单元格合并 + private MergeCellRule rowMerge; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/JgdfExportData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/JgdfExportData.java new file mode 100644 index 0000000..5bd4d0a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/JgdfExportData.java @@ -0,0 +1,39 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class JgdfExportData { + + private String index; + + /** + * 应答人名称 + */ + private String companyName; + + /** + * 报价 + */ + private String bj; + /** + * 评审价 + */ + private String psj; + /** + * 最低价 + */ + private String zdj; + /** + * 平均价 + */ + private String pjj; + /** + * 报价得分 + */ + private String bjdf; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/OpenRecordExportData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/OpenRecordExportData.java new file mode 100644 index 0000000..f4a0cf5 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/OpenRecordExportData.java @@ -0,0 +1,32 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + + +import com.deepoove.poi.expression.Name; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * 开标记录表导出数据实体 + */ +@Data +@Accessors(chain = true) +public class OpenRecordExportData implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer index; + + private String projName; + + private String projNum; + + private String bidNum; + + private String openTime; + + @Name("detail_table") + private ExportTableData tableData; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java deleted file mode 100644 index 264cd16..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/Tdoc.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; - -import io.swagger.annotations.ApiModelProperty; - -public class Tdoc { - - @ApiModelProperty(value = "") - private String assessRoomId; - - @ApiModelProperty(value = "轮次") - private Integer turnSort; - - public String getAssessRoomId() { - return assessRoomId; - } - - public void setAssessRoomId(String assessRoomId) { - this.assessRoomId = assessRoomId; - } - - public Integer getTurnSort() { - return turnSort; - } - - public void setTurnSort(Integer turnSort) { - this.turnSort = turnSort; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java index 0ed055a..7d3b597 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java @@ -2,9 +2,9 @@ package com.chinaunicom.mall.ebtp.extend.export.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.export.bean.BizExportDict; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; import com.chinaunicom.mall.ebtp.extend.export.service.ExportServiceFactory; -import com.chinaunicom.mall.ebtp.extend.export.service.IBizExportDictService; +import com.chinaunicom.mall.ebtp.extend.export.service.dict.IBizExportDictService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,7 +41,7 @@ public class ExportController { */ @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") @GetMapping(value = "/{type}") - public void export(@PathVariable String type, ExportParame param, HttpServletRequest request, HttpServletResponse response) { + public void export(@PathVariable String type, ExportParam param, HttpServletRequest request, HttpServletResponse response) { exportServiceFactory.getService(type).doExport(param, request, response); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/BizExportDictMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/BizExportDictMapper.java index 946adf2..4edf3ae 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/BizExportDictMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/BizExportDictMapper.java @@ -11,5 +11,5 @@ public interface BizExportDictMapper extends IBaseMapper { public List selectDictList(@Param("type") String type); - + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml index a246bfc..24717c5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml @@ -4,13 +4,13 @@ - - - - - - - + + + + + + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/enums/ExportExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/enums/ExportExceptionEnum.java index 99cba84..1061ca6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/enums/ExportExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/enums/ExportExceptionEnum.java @@ -9,7 +9,6 @@ import lombok.Getter; public enum ExportExceptionEnum implements BusinessExceptionAssert { - /** * 方法不存在 */ 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 deleted file mode 100644 index dac2862..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/OpenFeignService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; -import com.chinaunicom.mall.ebtp.extend.export.feign.factory.ExportServiceOpenFallbakFactory; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * 调用 OPEN_SERVICE - */ -@FeignClient(value = "${mconfig.feign.name.open}",fallbackFactory = ExportServiceOpenFallbakFactory.class) -public interface OpenFeignService { - - - /** - * 查询数据 - * - * @param - * @return - */ - @ApiOperation("查询数据") - @PostMapping ("/v1/bizbidopenroom/getPostlist") - BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) BizBidOpenroom bizBidOpenroom); - -} - 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 deleted file mode 100644 index a7da9a2..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RespsFeignService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * 调用 RESPS_SERVICE - */ -@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); - - -} 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 deleted file mode 100644 index 585d3db..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/RsmsFeignService.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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.*; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * 调用 RSMS_SERVICE - */ -@FeignClient(value = "${mconfig.feign.name.rsms}", fallbackFactory = ExportServiceFallback.class) -public interface RsmsFeignService { - /** - * 不同供应商的打分 - * - * @param bidEvalDetailDTO - * @return - */ - @PostMapping("/v1/bid/eval/record/findScoreRecord") - BaseResponse> findScoreRecord(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); - - - /** - * 评委供应商 - * - * @param bidEvalInfoDTO - * @return - */ -// @PostMapping("/v1/bid/archive/findRegister") - @GetMapping("/v1/bid/eval/detail/findRegister") - BaseResponse> findRegisterAndUser(@SpringQueryMap BidEvalInfoDTO bidEvalInfoDTO); - - /** - * 初审汇总 - * - * @param bidEvalDetailDTO - * @return - */ - @PostMapping("/v1/bid/eval/summary/findScoreEarlySummary") - BaseResponse> findScoreEarlySummary(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); - - /** - * 价格打分 - * - * @param bidEvalDetailDTO - * @return - */ - @PostMapping("/v1/bid/eval/record/findPriceScoreRecord") - BaseResponse> findPriceScoreRecord(@SpringQueryMap BidEvalDetailDTO bidEvalDetailDTO); - - - @ApiOperation("报表打印-通过评审室Id查询评委会成员数据及签到数据") - @GetMapping("v1/jury/report/print/{roomId}") - BaseResponse> queryReportPrintByRoomId(@ApiParam(value = "roomId", required = true) @PathVariable String roomId); - - /** - * 打分汇总 - * - * @param bidEvalDetailDTO - * @return - */ - @PostMapping("v1/bid/archive/findCategoryResultSummary") - BaseResponse>> findCategoryResultSummary(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); - - - /** - * 初步评审表 - * - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @ApiOperation("初步评审表") - @PostMapping("/v1/bid/archive/findEarlyArchiveList") - BaseResponse>> findEarlyArchiveList(@RequestParam("sectionId") String sectionId, - @RequestParam("isReviewMethod") String isReviewMethod, - @RequestBody List list); - - /** - * 详细评审表|专家打分表|价格打分表|打分汇总表 - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @ApiOperation("详细评审表|专家打分表|价格打分表|打分汇总表") - @PostMapping("/v1/bid/archive/findDetailArchiveList") - BaseResponse>> findDetailArchiveList(@RequestParam("sectionId") String sectionId, - @RequestParam("isReviewMethod") String isReviewMethod, - @RequestBody List list) ; - /** - * 评审报告 - * - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @ApiOperation("评审报告") - @PostMapping("/v1/bid/archive/findReviewReportArchiveList") - BaseResponse>> findReviewReportArchiveList(@RequestParam("sectionId") String sectionId, - @RequestParam("isReviewMethod") String isReviewMethod, - @RequestBody List list); - - /** - * 通过评审室查询detail表数据 - * - * @param assessRoomId - * - * @return - */ - @ApiOperation("通过评审室查询detail表数据") - @GetMapping("/v1/reviewresult/queryDetailByRoomId/{assessRoomId}") - BaseResponse> get(@ApiParam(value = "评审室id", required = true) @PathVariable String assessRoomId); -} - - diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceFallback.java deleted file mode 100644 index 14b84a0..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceFallback.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; - -import cn.hutool.core.exceptions.ExceptionUtil; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.vo.*; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Component -@Slf4j -public class ExportServiceFallback implements FallbackFactory { - - @Override - public RsmsFeignService create(Throwable throwable) { - RsmsFeignService back = new RsmsFeignService() { - @Override - public BaseResponse> findScoreRecord(BidEvalDetailDTO bidEvalDetailDTO) { - return null; - } - - @Override - public BaseResponse> findRegisterAndUser(BidEvalInfoDTO bidEvalInfoDTO) { - return null; - } - - @Override - public BaseResponse> findScoreEarlySummary(BidEvalDetailDTO bidEvalDetailDTO) { - return null; - } - - @Override - public BaseResponse> findPriceScoreRecord(BidEvalDetailDTO bidEvalDetailDTO) { - return null; - } - - @Override - public BaseResponse> queryReportPrintByRoomId(String roomId) { - return null; - } - - @Override - public BaseResponse>> findCategoryResultSummary(BidEvalDetailDTO bidEvalDetailDTO) { - return null; - } - - /** - * 初步评审表 - * - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @Override - public BaseResponse>> findEarlyArchiveList(String sectionId, String isReviewMethod, List list) { - return null; - } - - /** - * 详细评审表|专家打分表|价格打分表|打分汇总表 - * - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @Override - public BaseResponse>> findDetailArchiveList(String sectionId, String isReviewMethod, List list) { - return null; - } - - /** - * 评审报告 - * - * @param sectionId 标段ID - * @param isReviewMethod 是否为资审方式 0 否 1 是 - * @param list 节点集合 - * @return com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse> - * @author dino - * @date 2021/1/19 15:08 - */ - @Override - public BaseResponse>> findReviewReportArchiveList(String sectionId, String isReviewMethod, List list) { - return null; - } - - @Override - public BaseResponse> get(String assessRoomId) { - log.error("评审室id:{}", assessRoomId); - return BaseResponse.fail(new ArrayList<>()); - } - - }; - log.error(ExceptionUtil.stacktraceToString(throwable)); - return null; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceOpenFallbakFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceOpenFallbakFactory.java deleted file mode 100644 index da0e857..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceOpenFallbakFactory.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; - -import cn.hutool.core.exceptions.ExceptionUtil; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; -import com.chinaunicom.mall.ebtp.extend.export.feign.OpenFeignService; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@Slf4j -public class ExportServiceOpenFallbakFactory implements FallbackFactory { - @Override - public OpenFeignService create(Throwable throwable) { - OpenFeignService resps = new OpenFeignService() { - @Override - public BaseResponse> list(BizBidOpenroom bizBidOpenroom) { - return null; - } - }; - log.error(ExceptionUtil.stacktraceToString(throwable)); - return null; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceRespsFallbakFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceRespsFallbakFactory.java deleted file mode 100644 index 05aee0b..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ExportServiceRespsFallbakFactory.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; - -import cn.hutool.core.exceptions.ExceptionUtil; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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.RespsFeignService; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; -@Component -@Slf4j -public class ExportServiceRespsFallbakFactory implements FallbackFactory { - @Override - public RespsFeignService create(Throwable throwable) { - RespsFeignService resps = new RespsFeignService() { - @Override - public BaseResponse> getTenderQuoteList(Tdoc tdocPara) { - return null; - } - }; - log.error(ExceptionUtil.stacktraceToString(throwable)); - return null; - } -} 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 d66a868..30d723e 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,28 +1,54 @@ package com.chinaunicom.mall.ebtp.extend.export.service; -import java.io.File; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.util.PoitlIOUtils; +import lombok.SneakyThrows; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.OutputStream; public interface ExportService { + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response); - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response); - default File getExportTemplet(String path) { - File f = new File("C:\\Users\\Administrator\\Desktop\\新建文件夹\\doc\\" + path); + /** + * 执行导出操作 + * + * @param template + * @param fileName + * @param response + */ + @SneakyThrows + default void write(XWPFTemplate template, String fileName, HttpServletResponse response) { - return f; - } + response.setContentType("application/octet-stream"); + response.setHeader("Content-disposition", "attachment;filename=" + fileName); + + // HttpServletResponse response + OutputStream out = response.getOutputStream(); + BufferedOutputStream bos = new BufferedOutputStream(out); + template.write(bos); + bos.flush(); + out.flush(); + PoitlIOUtils.closeQuietlyMulti(template, bos, out); + } + + default File getExportTemplet(String path) { + File f = new File("D:\\EasyPoiTemplet\\" + path); + + return f; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportServiceFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportServiceFactory.java index 94b4c9f..a885a5e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportServiceFactory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/ExportServiceFactory.java @@ -11,13 +11,13 @@ import java.util.Map; public class ExportServiceFactory { @Autowired - private Map map = new LinkedHashMap<>(); + private final Map EXPORT_MAP = new LinkedHashMap<>(); public ExportService getService(String key) { - if (!map.containsKey(key)) { + if (!EXPORT_MAP.containsKey(key)) { ExportExceptionEnum.FRAME_EXCEPTION_METHOD_IS_NOT_EXIXT.throwException(); } - return map.get(key); + return EXPORT_MAP.get(key); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/ExportCommonFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/ExportCommonFeignService.java new file mode 100644 index 0000000..278f122 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/ExportCommonFeignService.java @@ -0,0 +1,134 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.common; + + +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.feign.entity.*; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.*; + +import java.util.List; +import java.util.Map; + +/** + * 报表导出通用feign接口调用类 + */ +public interface ExportCommonFeignService { + + /** + * 根据id 查询报表打印字典项名称 + * + * @param id + * @return + */ + String exportDictName(String id, String defaultName); + + /** + * 查询用户信息 + */ + LoginUserDetailVO userCenterGetLoninUserDetail(String userId); + + + /** + * 根据包id 查询信息 + * + * @param sectionId + * @return + */ + ProjectSectionVO projectGetSectionById(String sectionId); + + /** + * 根据包id 查询项目信息 + * + * @param projId + * @return + */ + ProjectRecordVO projectGetProjById(String projId); + + + /** + * 根据评审室id 查询供应商信息 + * + * @param roomId + * @return + */ + List tenderGetSupplierRegisterByRoomId(String roomId); + +// ------------------------------------------------ rsms -------------------------------- + + /** + * 查询初审汇总数据 + * + * @param param + * @return + */ + List rsmsFindScoreEarlySummary(ExportParam param); + + /** + * 打分汇总表 + * + * @param param + * @return + */ + Map> exportScoreSummary(ExportParam param); + + /** + * 价格打分表 + * + * @param param + * @return + */ + List exportPrice(ExportParam param); + + /** + * 专家个人打分表 + * + * @param param + * @return + */ + + Map> exportDetail(ExportParam param); +// ------------------------------------------------ rsms end -------------------------------- + + /** + * 通过评审室Id查询评委会成员数据及签到数据 + * + * @param roomId + * @return + */ + List rsmsQueryReportPrintByRoomId(String roomId); + + /** + * 通过评审室查询detail表数据 + * + * @param roomId + * @return + */ + List rsmsQueryReviewDetailByRoomId(String roomId); + + + /** + * 开标唱标页列表 + * + * @param tdocPara assessRoomId 评审室id turnSort 轮次序号 + * @return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + Map respsGetOpenTenderList(ExportParam param); + + + /** + * 查询供应商报价 + * + * @param tdocPara assessRoomId 评审室id turnSort 轮次序号 + * @return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + List respsGetQuoteByRoomIdAndTurnSort(ExportParam param); + + + /** + * 通过room_id查询评审室信息 + * + * @param roomId + * @return + */ + BizAssessRoom processGetRoomInfoById(String roomId); + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/impl/ExportCommonFeignServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/impl/ExportCommonFeignServiceImpl.java new file mode 100644 index 0000000..d3cf265 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/common/impl/ExportCommonFeignServiceImpl.java @@ -0,0 +1,268 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.common.impl; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizExportDict; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.dict.IBizExportDictService; +import com.chinaunicom.mall.ebtp.extend.feign.client.*; +import com.chinaunicom.mall.ebtp.extend.feign.entity.*; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * 报表导出通用feign接口调用类 + */ +@Service +@Slf4j +public class ExportCommonFeignServiceImpl implements ExportCommonFeignService { + + + @Autowired + private IBizExportDictService exportDictService; + + /** + * 根据id 查询报表打印字典项名称 + * + * @param id + * @param defaultName + * @return + */ + @Override + public String exportDictName(String id, String defaultName) { + BizExportDict dict = exportDictService.getById(id); + return Optional.ofNullable(Optional.ofNullable(dict).orElseGet(BizExportDict::new).getDicName()).orElse(defaultName); + } + + @Autowired + private UsercenterFeignService usercenterFeignService; + + /** + * 查询用户信息 + * + * @param userId + */ + @Override + public LoginUserDetailVO userCenterGetLoninUserDetail(String userId) { + BaseResponse response = usercenterFeignService.getLoninUserDetail(userId); + if (response == null || response.getData() == null) { + return new LoginUserDetailVO(); + } + return response.getData(); + } + + + @Autowired + private ProjectFeignService projectFeignService; + + /** + * 根据包id 查询信息 + * + * @param sectionId + * @return + */ + @Override + public ProjectSectionVO projectGetSectionById(String sectionId) { + //查询项目名称 + ProjectSectionVO projectSectionVO = new ProjectSectionVO(); + projectSectionVO.setId(sectionId); + BaseResponse response = projectFeignService.selectById(projectSectionVO); + if (response == null || response.getData() == null) { + return new ProjectSectionVO(); + } + return response.getData(); + } + + /** + * 根据包id 查询项目信息 + * + * @param projId + * @return + */ + @Override + public ProjectRecordVO projectGetProjById(String projId) { + BaseResponse response = projectFeignService.getProjById(projId); + if (response == null || response.getData() == null) { + return new ProjectRecordVO(); + } + return response.getData(); + } + + + @Autowired + private TenderFeignService tenderFeignService; + + /** + * 根据评审室id 查询供应商信息 + * + * @param roomId + * @return + */ + @Override + public List tenderGetSupplierRegisterByRoomId(String roomId) { + BaseResponse> response = tenderFeignService.queryRoomTenderCount(roomId); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + // ------------------------------------------------ rsms -------------------------------- + @Autowired + private RsmsFeignService rsmsFeignService; + + /** + * 查询初审汇总数据 + * + * @param param + * @return + */ + @Override + public List rsmsFindScoreEarlySummary(ExportParam param) { + BaseResponse> response = rsmsFeignService.exportEarly(param.getAssessRoomId()); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + + /** + * 打分汇总表 + * + * @param param + * @return + */ + @Override + public Map> exportScoreSummary(ExportParam param) { + BaseResponse>> response = rsmsFeignService.exportScoreSummary(param.getAssessRoomId()); + if (response == null || response.getData() == null) { + return new HashMap<>(); + } + return response.getData(); + } + + /** + * 价格打分表 + * + * @param param + * @return + */ + @Override + public List exportPrice(ExportParam param) { + BaseResponse> response = rsmsFeignService.exportPrice(param.getAssessRoomId()); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + /** + * 专家个人打分表 + * + * @param param + * @return + */ + @Override + public Map> exportDetail(ExportParam param) { + BidEvalCategoryDTO bidEvalCategoryDTO = new BidEvalCategoryDTO(); + bidEvalCategoryDTO.setAssessRoomId(param.getAssessRoomId()).setUserIds(param.getUserList()); + BaseResponse>> response = rsmsFeignService.exportDetail(bidEvalCategoryDTO); + if (response == null || response.getData() == null) { + return new HashMap<>(); + } + return response.getData(); + } + + /** + * 通过评审室Id查询评委会成员数据及签到数据 + * + * @param roomId + * @return + */ + @Override + public List rsmsQueryReportPrintByRoomId(String roomId) { + BaseResponse> response = rsmsFeignService.queryReportPrintByRoomId(roomId); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + /** + * 通过评审室查询detail表数据 + * + * @param roomId + * @return + */ + @Override + public List rsmsQueryReviewDetailByRoomId(String roomId) { + BaseResponse> response = rsmsFeignService.get(roomId); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + // ------------------------------------------------ rsms end -------------------------------- + @Autowired + private RespsFeignService respsFeignService; + + /** + * 开标唱标页列表 + * + * @param tdocPara assessRoomId 评审室id turnSort 轮次序号 + * @return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + @Override + public Map respsGetOpenTenderList(ExportParam param) { + Tdoc tdoc = new Tdoc(); + tdoc.setAssessRoomId(param.getAssessRoomId()) + .setTurnSort(param.getReviewTurnSort()); + BaseResponse response = respsFeignService.getOpenTenderList(tdoc); + + if (response == null || response.getData() == null) { + return new HashMap(); + } + return response.getData(); + } + + /** + * 查询供应商报价 + * + * @param param@return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + @Override + public List respsGetQuoteByRoomIdAndTurnSort(ExportParam param) { + Tdoc tdoc = new Tdoc(); + tdoc.setAssessRoomId(param.getAssessRoomId()); + BaseResponse> response = respsFeignService.getQuoteByRoomIdAndTurnSort(tdoc); + if (response == null || response.getData() == null) { + return new ArrayList<>(); + } + return response.getData(); + } + + @Autowired + private ProcessFeignService processFeignService; + + /** + * 通过room_id查询评审室信息 + * + * @param roomId + * @return + */ + @Override + public BizAssessRoom processGetRoomInfoById(String roomId) { + BaseResponse response = processFeignService.getById(roomId); + if (response == null || response.getData() == null) { + return new BizAssessRoom(); + } + return response.getData(); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/IBizExportDictService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/IBizExportDictService.java similarity index 74% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/IBizExportDictService.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/IBizExportDictService.java index 98f6103..14a098a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/IBizExportDictService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/IBizExportDictService.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.service; +package com.chinaunicom.mall.ebtp.extend.export.service.dict; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; @@ -18,5 +18,5 @@ public interface IBizExportDictService extends IBaseService { /** * 查询list */ - public Map> getList(String roomId); + public Map> getList(String roomId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/impl/BizExportDictServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/impl/BizExportDictServiceImpl.java new file mode 100644 index 0000000..984e872 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/dict/impl/BizExportDictServiceImpl.java @@ -0,0 +1,76 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.dict.impl; + + +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.extend.export.bean.BizExportDict; +import com.chinaunicom.mall.ebtp.extend.export.dao.BizExportDictMapper; +import com.chinaunicom.mall.ebtp.extend.export.service.dict.IBizExportDictService; +import com.chinaunicom.mall.ebtp.extend.feign.client.ProcessFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.client.ProjectFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizAssessRoom; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 对数据表 biz_export_dict 操作的 serviceImpl + * + * @author Auto create + */ +@Service +@Slf4j +public class BizExportDictServiceImpl extends BaseServiceImpl implements IBizExportDictService { + + @Autowired + private ProcessFeignService processFeignService; + @Autowired + private ProjectFeignService projectFeignService; + + /** + * 查询list + * + * @param roomId + */ + @Override + public Map> getList(String roomId) { + BizAssessRoom room = processFeignService.getById(roomId).getData(); + //查询项目名称 + ProjectRecordVO proj = projectFeignService.getProjById(room.getTpId()).getData(); + + List list = baseMapper.selectDictList(proj.getBidMethodDict()); + + List level1 = list.stream().filter(f -> f.getLevel().equals(1)).sorted(Comparator.comparing(BizExportDict::getId)) + .collect(Collectors.toList()); + List level2 = list.stream().filter(f -> f.getLevel().equals(2)).sorted(Comparator.comparing(BizExportDict::getId)) + .collect(Collectors.toList()); + + Map> resultsMap = new HashMap<>(); + + for (BizExportDict bizExportDict : level1) { + // 评审室未结束 不拼接评审打分等数据表 +// if (room.getStatus() < 3 && !bizExportDict.getId().equals(100)) { +// continue; +// } + resultsMap.put( + bizExportDict.getDicName(), + level2.stream() + .filter(f -> f.getPath().equals(String.valueOf(bizExportDict.getId()))) + .map(m -> m.setUrl(m.getUrl() + "?id=" + m.getId() + "&projectId=" + proj.getId() + "§ionId=" + room.getSectionId() + "&assessRoomId=" + roomId) + .setOnClick(true)) + .collect(Collectors.toList()) + ); + } + //删除value为空的key + resultsMap.values().removeIf(List::isEmpty); + return resultsMap; + } + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BidOpenRecordImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BidOpenRecordImpl.java new file mode 100644 index 0000000..75bda2e --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BidOpenRecordImpl.java @@ -0,0 +1,149 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportTableData; +import com.chinaunicom.mall.ebtp.extend.export.bean.OpenRecordExportData; +import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.policy.DetailTablePolicy; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.TdocCatalog; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.data.*; +import lombok.SneakyThrows; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + + +/** + * 开标记录表导出 + */ +@Service("bidOpenRecord") +public class BidOpenRecordImpl implements ExportService { + + private static final String DATE_FORMATTER = "yyyy年MM月dd日HH时mm分"; + + + @Autowired + private ExportCommonFeignService commonFeignService; + + @Autowired + private TemplateFileService templateFileService; + + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + @SneakyThrows + @Override + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + //查询包 + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + + //查询项目 + ProjectRecordVO proj = commonFeignService.projectGetProjById(section.getProjectId()); + + //供应商信息 + List suppliers = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + + Map openTenderList = commonFeignService.respsGetOpenTenderList(param); + + OpenRecordExportData data = new OpenRecordExportData(); + data.setProjName(proj.getProjectName()) + .setProjNum(Optional.ofNullable(proj.getAgencyCompanyProjectNum()).orElse(proj.getEbpProjectNumber())) + .setBidNum(section.getBidSectBizNum()); + + ExportTableData tableData = new ExportTableData(); + + //应答项 + List cells = new ArrayList<>(); + //应答数据 + List rows = new ArrayList<>(); + + if (openTenderList.containsKey("title")) { + //标题 + List title = JsonUtils.jsonToList((List) openTenderList.get("title"), TdocCatalog.class); + //去除解密状态列 + title.removeIf(t -> t.getCatalogType() != null); + + List titleIds = new ArrayList<>(); + for (TdocCatalog tdocCatalog : title) { + cells.add(Cells.of(tdocCatalog.getName()).create()); + titleIds.add(tdocCatalog.getId()); + } + + cells.add(Cells.of("是否异议").create()); + cells.add(Cells.of("投标人授权代表签字确认时间").create()); + + if (openTenderList.containsKey("suppliers")) { + //供应商 + List regs = JsonUtils.jsonToList((List) openTenderList.get("suppliers"), BizSupplierRegister.class); + Map regMap = regs.stream().collect(Collectors.toMap(BizSupplierRegister::getCompanyId, Function.identity())); + + for (int i = 0; i < suppliers.size(); i++) { + BizSupplierRegister supplier = suppliers.get(i); + RowRenderData e = Rows.of(String.valueOf(i + 1), supplier.getCompanyName()).create(); + if (regMap.containsKey(supplier.getCompanyId())) { + //应答数据 + Map dataMap = regMap.get(supplier.getCompanyId()).getDataMap(); + for (String titleId : titleIds) { + e.addCell(Cells.of(dataMap.get(titleId)).create()); + } + e.addCell(Cells.of("").create()); + String s = StringUtils.isBlank(supplier.getSignUserId()) ? "" : commonFeignService.userCenterGetLoninUserDetail(supplier.getSignUserId()).getOuName() + ":" + DateUtil.format(supplier.getSignTime(), DATE_FORMATTER); + e.addCell(Cells.of(s).create()); + + } else { + cells.forEach(c -> e.addCell(Cells.of("").create())); + } + rows.add(e); + } + + } + + rows.add(Rows.of("备注信息").center().create()); + rows.add(Rows.of("").create()); + } + + + //横向合并 + MergeCellRule hangBuild = MergeCellRule.builder().map(MergeCellRule.Grid.of(rows.size(), 0), MergeCellRule.Grid.of(rows.size(), cells.size() + 1)) + .map(MergeCellRule.Grid.of(rows.size() - 1, 0), MergeCellRule.Grid.of(rows.size() - 1, cells.size() + 1)) + .build(); + + data.setTableData(tableData.setCells(cells).setRows(rows).setCellMerge(hangBuild)) + .setOpenTime(DateUtil.format(LocalDateTime.now(), DATE_FORMATTER)); + + InputStream file = templateFileService.getExportTemplet("bidOpenRecord"); +// File file = getExportTemplet("开标记录表.docx"); + Configure config = Configure.builder().bind("detail_table", new DetailTablePolicy()).build(); + XWPFTemplate template = XWPFTemplate.compile(file, config).render(data); + + String dictName = commonFeignService.exportDictName(param.getId(), "开标记录表") + ".docx"; + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + + this.write(template, fileName, response); + } +} 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 deleted file mode 100644 index e2ff4f4..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - - -import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.common.constant.CommonConstants; -import com.chinaunicom.mall.ebtp.common.util.JsonUtils; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.dao.BizExportDictMapper; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProcessFeignClient; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.service.IBizExportDictService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * 对数据表 biz_export_dict 操作的 serviceImpl - * - * @author Auto create - */ -@Service -@Slf4j -public class BizExportDictServiceImpl extends BaseServiceImpl implements IBizExportDictService { - - @Autowired - private ProcessFeignClient processFeignClient; - @Autowired - private ProjectFeignService projectFeignService; - @Autowired - private RsmsFeignService rsmsFeignService; - - /** - * 查询list - * - * @param roomId - */ - @Override - public Map> getList(String roomId) { - BizAssessRoom room = processFeignClient.getById(roomId).getData(); - //查询项目名称 - ProjectRecordVO proj = projectFeignService.getProjById(room.getTpId()).getData(); - //包 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(room.getSectionId()); - ProjectSectionVO section = projectFeignService.selectById(projectSectionVO).getData(); - - List list = baseMapper.selectDictList(proj.getBidMethodDict()); - - List level1 = list.stream().filter(f -> f.getLevel().equals(1)).sorted(Comparator.comparing(BizExportDict::getId)) - .collect(Collectors.toList()); - List level2 = list.stream().filter(f -> f.getLevel().equals(2)).sorted(Comparator.comparing(BizExportDict::getId)) - .collect(Collectors.toList()); - - Map> resultsMap = new HashMap<>(); - - //是否包含开标阶段 - boolean toInitialOpenRoom = room.getRoomType().equals(CommonConstants.ROOM_TYPE_2); - - for (BizExportDict bizExportDict : level1) { - //不含开标阶段 100 = 开标阶段 - if (!toInitialOpenRoom && bizExportDict.getId().equals(100)) { - continue; - } - // 评审室未结束 不拼接评审打分等数据表 - if (room.getStatus() < 3 && !bizExportDict.getId().equals(100)) { - continue; - } - resultsMap.put( - bizExportDict.getDicName(), - level2.stream() - .filter(f -> f.getPath().equals(String.valueOf(bizExportDict.getId()))) - .collect(Collectors.toList()) - ); - } - //初审数据url - String isReviewMethod = room.getRoomType().equals(CommonConstants.ROOM_TYPE_1) ? "1" : "0"; - List archiveLinks = getFirstArchiveLinks(); - Map> firstRvwMap = rsmsFeignService.findEarlyArchiveList(room.getSectionId(), isReviewMethod, archiveLinks).getData(); - //详审数据url - archiveLinks = getDetailArchiveLinks(); - Map> detailRvwMap = rsmsFeignService.findDetailArchiveList(room.getSectionId(), isReviewMethod, archiveLinks).getData(); - - - resultsMap.forEach((key, value) -> { - value.forEach(bizExportDict -> { - if ("1".equals(bizExportDict.getUrl())) { - //查询初审报表 - Optional opt = firstRvwMap.get(bizExportDict.getUrl()).stream().filter(f -> f.getAssessRoomId().equals(roomId)).findFirst(); - opt.ifPresent(o -> bizExportDict.setUrl(o.getArchiveFileUrl())); - } 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())); - } else { - String sbl = bizExportDict.getUrl() + - "?assessRoomId=" + roomId + -// "&reviewTurnId=" + v.getReviewTurnId() + - "&projectId=" + proj.getId() + - "§ionId=" + section.getId(); - bizExportDict.setUrl(sbl); - } - }); - //如果没进行初审或详审 则删除相关报表 length < 5 为虚数 - value.removeIf(bizExportDict -> bizExportDict.getUrl().length() < 5); - }); - //删除value为空的key - resultsMap.values().removeIf(List::isEmpty); - return resultsMap; - } - - private List getFirstArchiveLinks() { - List archiveLinks = new ArrayList<>(); - //初步评审表URL - archiveLinks.add(new ArchiveLink().setId("1").setArchiveDirectory("1")); - return archiveLinks; - } - - private List getDetailArchiveLinks() { - List archiveLinks = new ArrayList<>(); - //详细评审表URL -// archiveLinks.add(new ArchiveLink().setId("2").setArchiveDirectory("2")); - //专家打分表URL - archiveLinks.add(new ArchiveLink().setId("3").setArchiveDirectory("3")); - //价格打分表URL - archiveLinks.add(new ArchiveLink().setId("4").setArchiveDirectory("4")); - //打分汇总表URL - archiveLinks.add(new ArchiveLink().setId("5").setArchiveDirectory("5")); - //评审报告URL -// archiveLinks.add(new ArchiveLink().setId("6").setArchiveDirectory("6")); - return archiveLinks; - } - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/CbpsExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/CbpsExportServiceImpl.java index 372ea38..57f7d3f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/CbpsExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/CbpsExportServiceImpl.java @@ -1,41 +1,45 @@ package com.chinaunicom.mall.ebtp.extend.export.service.impl; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; +import com.chinaunicom.mall.ebtp.common.poiExport.constant.ExportConstant; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTable; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTd; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTr; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.CbpsExportData; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.BidEvalEarlyJudgesSummaryVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.ReviewConfigCategoryDTO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.ReviewConfigDetailDTO; import lombok.SneakyThrows; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Optional; /** - * 初步评审 + * 初步评审表 + * + * @author fqj */ @Service("cbps") +@Slf4j public class CbpsExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final ProjectFeignService projectFeignService; - public CbpsExportServiceImpl(ProjectFeignService projectFeignService, RsmsFeignService rsmsFeignService) { - this.projectFeignService = projectFeignService; - this.rsmsFeignService = rsmsFeignService; - } + @Autowired + private ExportCommonFeignService commonFeignService; + /** * 导出 @@ -46,217 +50,121 @@ public class CbpsExportServiceImpl implements ExportService { */ @SneakyThrows @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - //查询项目名称 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - BaseResponse list = projectFeignService.selectById(projectSectionVO); + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("初步评审表,ExportParam = {}", JsonUtils.objectToJson(param)); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "初步评审表"); + //查询包 + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + log.info("初步评审表 {},查询包信息 {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); + //查询项目 + ProjectRecordVO proj = commonFeignService.projectGetProjById(section.getProjectId()); + log.info("初步评审表 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(proj)); + //供应商信息 + List suppliers = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + log.info("初步评审表 {},查询供应商信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(suppliers)); + //初审评分信息 + List earlySummary = commonFeignService.rsmsFindScoreEarlySummary(param); + log.info("初步评审表 {},查询评分信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(earlySummary)); + ExcelTable table = new ExcelTable(dictName); + table.setFileName(dictName); - BidEvalInfoDTO bidEvalInfoDTO = new BidEvalInfoDTO(); - bidEvalInfoDTO.setAssessRoomId(param.getAssessRoomId()); - bidEvalInfoDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalInfoDTO.setReviewType(param.getReviewType()); - //供应商 - List listBaseResponse = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO).getData(); + List list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue(dictName).setCellStyleKey("noBorderCenter16").setIsRowMerge(true).setRowMergeNum(suppliers.size() + 3)); + table.add(new ExcelTr().setExcelTdList(list)); - //列头 - StringBuffer titles0 = new StringBuffer("序号,评审因素,评审标准"); - //供应商 顺序 - ArrayList strings = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.size(); i++) { - strings.add(listBaseResponse.get(i).getSupplierRegisterId()); - titles0.append("," + listBaseResponse.get(i).getSupplierRegisterName()); + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("项目名称:" + proj.getProjectName()).setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(suppliers.size() + 3)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("招标编号:" + Optional.ofNullable(proj.getAgencyCompanyProjectNum()).orElse(proj.getEbpProjectNumber())).setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(suppliers.size() + 3)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("序号")); + list.add(new ExcelTd().setTdValue("评审因素")); + list.add(new ExcelTd().setTdValue("评审标准")); + for (BizSupplierRegister supplier : suppliers) { + list.add(new ExcelTd().setTdValue(supplier.getCompanyName())); } - String titles = titles0.toString(); - //最右侧列值 - Integer index = (titles.split(",").length) - 1; - //自定义序号 - Integer num = 1; + table.add(new ExcelTr().setExcelTdList(list)); - // 创建工作簿 - SXSSFWorkbook wb = new SXSSFWorkbook(); - //表格样式 - CellStyle cellStyle = wb.createCellStyle(); - //水平居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //垂直居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //边框 - cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + List datas = new ArrayList<>(); + //所有评审项 + List detailList = new ArrayList<>(); + earlySummary.stream().map(ReviewConfigCategoryDTO::getDetailList).forEach(detailList::addAll); - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(param.getReviewType()); - BaseResponse> scoreRecord = rsmsFeignService.findScoreEarlySummary(bidEvalDetailDTO); - List dataList = scoreRecord.getData(); - - // 创建表格 - Sheet sheet = wb.createSheet("评审汇总"); - sheet.createFreezePane(1, 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("项目名称 : " + list.getData().getProjectName()); - //3行 - CellRangeAddress region3 = new CellRangeAddress(2, 2, 0, index); - sheet.addMergedRegion(region3); - Row title3 = sheet.createRow(rowIndex++); - Cell titleCell3 = title3.createCell(0); - titleCell3.setCellValue("招标编号 : " + list.getData().getBidSectBizNum()); - //4行 列头 - 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); - } - // 5行开始渲染 - for (ReviewConfigCategoryDTO object : dataList) { - List detailList = object.getDetailList(); - String name = object.getName(); - for (ReviewConfigDetailDTO reviewConfigDetailDTO : detailList) { - colIndex = 0; - Row titleRowN = sheet.createRow(rowIndex++); - Cell cell = titleRowN.createCell(colIndex++); - cell.setCellStyle(cellStyle); - //供应商结论是否合格 - Map scoreMap = reviewConfigDetailDTO.getEarlyMap(); - if (StringUtils.isEmpty(name)) { - cell.setCellValue("结论"); - - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellValue("是否通过初审检查"); - cell1.setCellStyle(cellStyle); - //占位列 - Cell cell2 = titleRowN.createCell(colIndex++); - cell2.setCellValue(""); - cell2.setCellStyle(cellStyle); - - if (scoreMap != null) { - for (String string : strings) { - Boolean actualValue; - String all = null; - if (scoreMap.get(string) != null) { - actualValue = scoreMap.get(string).getJudgesResult(); - if (actualValue != null) { - if (actualValue) { - all = "合格"; - } else { - all = "不合格"; - } - } else { - all = "空"; - } - } - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); - cell4.setCellValue(all); - } - } else { - for (int j = 0; j < strings.size(); j++) { - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); + for (int i = 0; i < detailList.size(); i++) { + ReviewConfigDetailDTO dto = detailList.get(i); + CbpsExportData data = new CbpsExportData(); + data.setIndex(String.valueOf(i + 1)) + .setScoreItem(dto.getScoreItem()) + .setRvwStandard(dto.getRvwStandard()); + //打分数据 + Map earlyMap = dto.getEarlyMap(); + if (earlyMap != null && earlyMap.size() > 0) { + if (i != detailList.size() - 1) { + for (BizSupplierRegister supplier : suppliers) { + if (earlyMap.containsKey(supplier.getId())) { + BidEvalEarlyJudgesSummaryVO summaryVO = earlyMap.get(supplier.getId()); + String sbl = (summaryVO.getJudgesResult() ? "✔" : "✖") + + "(" + summaryVO.getQualified() + "✔" + + summaryVO.getUnqualified() + "✖" + ")"; + data.getScores().add(sbl); + } else { + data.getScores().add("-"); } } } else { - cell.setCellValue(num++); - //评审因素 - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellValue(reviewConfigDetailDTO.getScoreItem()); - cell1.setCellStyle(cellStyle); - //评审标准 - Cell cell2 = titleRowN.createCell(colIndex++); - cell2.setCellValue(reviewConfigDetailDTO.getRvwStandard()); - cell2.setCellStyle(cellStyle); - - if (scoreMap != null) { - for (String string : strings) { - Boolean actualValue; - String all = null; - String qua = null; - String unqua = null; - if (scoreMap.get(string) != null) { - actualValue = scoreMap.get(string).getJudgesResult(); - if (actualValue != null) { - qua = scoreMap.get(string).getQualified(); - unqua = scoreMap.get(string).getUnqualified(); - if (actualValue) { - all = "√(√" + qua + ",×" + unqua + ")"; - } else { - all = "×(√" + qua + ",×" + unqua + ")"; - } - } else { - all = "空"; - } - } - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); - cell4.setCellValue(all); - } - } else { - for (int j = 0; j < strings.size(); j++) { - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); + //汇总数据 + for (BizSupplierRegister supplier : suppliers) { + if (earlyMap.containsKey(supplier.getId())) { + BidEvalEarlyJudgesSummaryVO summaryVO = earlyMap.get(supplier.getId()); + data.setIndex("结论") + .setScoreItem("是否通过初步评审") + .setRvwStandard("") + .getScores().add(summaryVO.getJudgesResult() ? "合格" : "不合格"); + } else { + data.getScores().add("-"); } } } + } else { + if (i != detailList.size() - 1) { + suppliers.forEach(supplier -> data.getScores().add("")); + } else { + //汇总数据 + suppliers.forEach(supplier -> + data.setIndex("结论") + .setScoreItem("是否通过初步评审") + .setRvwStandard("") + .getScores().add("")); + } } - - //合并结论 - if (StringUtils.isEmpty(name)) { - sheet.addMergedRegion(new CellRangeAddress(rowIndex - 1, rowIndex - 1, 1, 2)); - } + datas.add(data); } - //倒第2行 - Row title5 = sheet.createRow(rowIndex++); - Cell titleCell5 = title5.createCell(0); - titleCell5.setCellValue("全体评委签字:"); - CellRangeAddress region5 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, index); - sheet.addMergedRegion(region5); - //最后一行 - CellStyle cellStyle1 = wb.createCellStyle(); - cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - cellStyle1.setAlignment(HorizontalAlignment.RIGHT); - Row title6 = sheet.createRow(rowIndex++); - Cell titleCell6 = title6.createCell(0); - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy 年 MM 月 dd 日 "); - titleCell6.setCellValue("日期: " + sdf.format(date)); - titleCell6.setCellStyle(cellStyle1); - CellRangeAddress region6 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, index); - sheet.addMergedRegion(region6); + for (CbpsExportData data : datas) { + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue(data.getIndex())); + list.add(new ExcelTd().setTdValue(data.getScoreItem())); + list.add(new ExcelTd().setTdValue(data.getRvwStandard())); + for (String score : data.getScores()) { + list.add(new ExcelTd().setTdValue(score)); + } + table.add(new ExcelTr().setExcelTdList(list)); + } - String filename = "初步评审表.xlsx"; - 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(StandardCharsets.UTF_8), "ISO8859-1"))); - wb.write(response.getOutputStream()); + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("全体评委签字:").setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(suppliers.size() + 3)); + table.add(new ExcelTr().setExcelTdList(list)); + ExportConstant.exportFile(response, ExportConstant.generateExcelByTable(table)); } } 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 7588604..50639d4 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 @@ -1,21 +1,24 @@ package com.chinaunicom.mall.ebtp.extend.export.service.impl; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailJudgesSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.BidEvalDetailJudgesSummaryVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.BidEvalDetailSummaryVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.JuryPrintVO; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -23,25 +26,19 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 打分汇总 */ @Service("dfhz") +@Slf4j public class DfhzExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final ProjectFeignService projectFeignService; - public DfhzExportServiceImpl(RsmsFeignService rsmsFeignService, ProjectFeignService projectFeignService) { - this.rsmsFeignService = rsmsFeignService; - this.projectFeignService = projectFeignService; - } + @Autowired + private ExportCommonFeignService commonFeignService; /** * 导出 @@ -52,245 +49,252 @@ public class DfhzExportServiceImpl implements ExportService { */ @SneakyThrows @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - BidEvalInfoDTO bidEvalInfoDTO = new BidEvalInfoDTO(); - bidEvalInfoDTO.setAssessRoomId(param.getAssessRoomId()); - bidEvalInfoDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalInfoDTO.setReviewType(param.getReviewType()); - //所有评委数据源 - BaseResponse> judges = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO); + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("打分汇总表,ExportParam = {}", JsonUtils.objectToJson(param)); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "打分汇总表"); - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - bidEvalDetailDTO.setAssessRoomId(param.getAssessRoomId()); - bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(param.getReviewType()); + //查询包 + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + log.info("打分汇总表 {},查询包信息 {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); + //查询项目 + ProjectRecordVO proj = commonFeignService.projectGetProjById(section.getProjectId()); + log.info("打分汇总表 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(proj)); + //供应商信息 + List suppliers = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + log.info("打分汇总表 {},查询供应商信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(suppliers)); + //评委 + List memberAll = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); + log.info("打分汇总表 {},查询评委信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(memberAll)); //所有类型打分数据源 - BaseResponse>> list = rsmsFeignService.findCategoryResultSummary(bidEvalDetailDTO); - if (list != null && judges != null) { - //所有供应商 - List registerVOList = judges.getData(); + Map> detailList = commonFeignService.exportScoreSummary(param); + log.info("打分汇总表 {},查询所有类型打分数据源 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(detailList)); + // 创建工作簿 + SXSSFWorkbook wb = new SXSSFWorkbook(); + //表格样式 + CellStyle cellStyle = wb.createCellStyle(); + //水平居中 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + //边框 + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 + cellStyle.setBorderTop(BorderStyle.THIN);//上边框 + cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + cellStyle.setWrapText(true);//自动换行 - //打分数据 - Map> detailList = list.getData(); - - //所有评委 - List memberAll = registerVOList.stream().findFirst().get().getMembers(); - // 创建工作簿 - SXSSFWorkbook wb = new SXSSFWorkbook(); - //表格样式 - CellStyle cellStyle = wb.createCellStyle(); - //水平居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //垂直居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //边框 - cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle.setBorderRight(BorderStyle.THIN);//右边框 - - SXSSFSheet sheet = wb.createSheet(); - int rowIndex = 0; - //头 - SXSSFRow titleRow = createRow(sheet, rowIndex++); - Cell titleCell1 = titleRow.createCell(0); - titleRow.setHeightInPoints(35); - titleCell1.setCellValue("打分汇总表"); - //项目和招标名称数据 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - ProjectSectionVO proj = projectFeignService.selectById(projectSectionVO).getData(); - //项目名称 - SXSSFRow projectNameRow = sheet.createRow(rowIndex++); - SXSSFCell projectNameCell0 = projectNameRow.createCell(0); - projectNameCell0.setCellValue("项目名称:"); - SXSSFCell projectNameCell1 = projectNameRow.createCell(1); - projectNameCell1.setCellValue(proj.getProjectName()); - //招标编号 - SXSSFRow projectNumRow = sheet.createRow(rowIndex++); - SXSSFCell projectNumCell0 = projectNumRow.createCell(0); - projectNumCell0.setCellValue("项目编号:"); - SXSSFCell projectNumCell1 = projectNumRow.createCell(1); - projectNumCell1.setCellValue(proj.getBidSectBizNum()); - //列头 - List titles0 = new ArrayList<>(); - titles0.add("投标人名称"); - titles0.add("投标序号"); - //评委专家信息添加到列头 根据参加打分专家的id到所有专家列表中查询名字 - memberAll.forEach(x -> titles0.add(x.getName())); - //添加最后一列 - titles0.add("平均分"); - //商务 技术 服务 - for (int i = 0; i < 3; i++) { - List detailScore = new ArrayList<>(); - if (i == 0) { - if (detailList.containsKey("1")) { - detailScore = detailList.get("1"); - } - } else if (i == 1) { - if (detailList.containsKey("2")) { - detailScore = detailList.get("2"); - } - } else { - if (detailList.containsKey("5")) { - detailScore = detailList.get("5"); - } - } - - this.createRow(sheet, rowIndex++); - SXSSFRow row = this.createRow(sheet, rowIndex++); - if (i == 0) { - SXSSFCell cell = row.createCell(0); - cell.setCellValue("商务分数"); - } else if (i == 1) { - SXSSFCell cell = row.createCell(0); - cell.setCellValue("技术分数"); - } else { - SXSSFCell cell = row.createCell(0); - cell.setCellValue("服务分数"); - } + SXSSFSheet sheet = wb.createSheet(); + int rowIndex = 0; + //头 + CellStyle titleCell = wb.createCellStyle(); + //水平居中 + titleCell.setAlignment(HorizontalAlignment.CENTER); + //垂直居中 + titleCell.setVerticalAlignment(VerticalAlignment.CENTER); + SXSSFRow titleRow = createRow(sheet, rowIndex++); + Cell titleCell1 = titleRow.createCell(0); + titleRow.setHeightInPoints(35); + titleCell1.setCellValue(dictName); + titleCell1.setCellStyle(titleCell); + sheet.setColumnWidth(0, 16 * 256); - row = sheet.createRow(rowIndex++); - int cellIndex = 0; - for (String tit : titles0) { - this.createCell(row, cellIndex++, cellStyle, tit); - } - int index = 1; - - for (SupplierRegisterVO vo : registerVOList) { - cellIndex = 0; - row = sheet.createRow(rowIndex++); - this.createCell(row, cellIndex++, cellStyle, vo.getSupplierRegisterName()); - this.createCell(row, cellIndex++, cellStyle, String.valueOf(index++)); - - if (detailScore.isEmpty()) { - for (MemberVO memberVO : memberAll) { - this.createCell(row, cellIndex++, cellStyle, "-"); - - } - this.createCell(row, cellIndex, cellStyle, "-"); - - } else { - BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getSupplierRegisterId())).findFirst().get(); - Map memberScoreMap = detailSummary.getScoreMap(); - for (MemberVO memberVO : memberAll) { - BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); - this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); - } - this.createCell(row, cellIndex, cellStyle, detailSummary.getFinalScore() == null ? "" : String.valueOf(detailSummary.getFinalScore())); - } - } - } - - //报价 + //项目名称 + SXSSFRow projectNameRow = sheet.createRow(rowIndex++); + SXSSFCell projectNameCell0 = projectNameRow.createCell(0); + projectNameCell0.setCellValue("项目名称:"); + SXSSFCell projectNameCell1 = projectNameRow.createCell(1); + projectNameCell1.setCellValue(proj.getProjectName()); + //招标编号 + SXSSFRow projectNumRow = sheet.createRow(rowIndex++); + SXSSFCell projectNumCell0 = projectNumRow.createCell(0); + projectNumCell0.setCellValue("项目编号:"); + SXSSFCell projectNumCell1 = projectNumRow.createCell(1); + projectNumCell1.setCellValue(Optional.ofNullable(proj.getAgencyCompanyProjectNum()).orElse(proj.getEbpProjectNumber())); + //列头 + List titles0 = new ArrayList<>(); + titles0.add("投标人名称"); + titles0.add("投标序号"); + //评委专家信息添加到列头 根据参加打分专家的id到所有专家列表中查询名字 + memberAll.forEach(x -> titles0.add(x.getName())); + //添加最后一列 + titles0.add("平均分"); + //商务 技术 服务 + for (int i = 0; i < 3; i++) { List detailScore = new ArrayList<>(); - - if (detailList.containsKey("0")) { - detailScore = detailList.get("0"); + if (i == 0) { + if (detailList.containsKey("1")) { + detailScore = detailList.get("1"); + } + } else if (i == 1) { + if (detailList.containsKey("2")) { + detailScore = detailList.get("2"); + } + } else { + if (detailList.containsKey("5")) { + detailScore = detailList.get("5"); + } } - sheet.createRow(rowIndex++); - SXSSFRow row = sheet.createRow(rowIndex++); - SXSSFCell c = row.createCell(0); - c.setCellValue("价格分数"); - row = this.createRow(sheet, rowIndex++); + this.createRow(sheet, rowIndex++); + SXSSFRow row = this.createRow(sheet, rowIndex++); + if (i == 0) { + SXSSFCell cell = row.createCell(0); + cell.setCellValue("商务分数"); + } else if (i == 1) { + SXSSFCell cell = row.createCell(0); + cell.setCellValue("技术分数"); + } else { + SXSSFCell cell = row.createCell(0); + cell.setCellValue("服务分数"); + } - this.createCell(row, 0, cellStyle, "投标人名称"); - this.createCell(row, 1, cellStyle, "投标序号"); - this.createCell(row, 2, cellStyle, "价格得分"); + row = sheet.createRow(rowIndex++); + int cellIndex = 0; + for (String tit : titles0) { + this.createCell(row, cellIndex++, cellStyle, tit); + } int index = 1; - for (SupplierRegisterVO vo : registerVOList) { - int cellIndex = 0; + + for (BizSupplierRegister vo : suppliers) { + cellIndex = 0; row = sheet.createRow(rowIndex++); - this.createCell(row, cellIndex++, cellStyle, vo.getSupplierRegisterName()); + this.createCell(row, cellIndex++, cellStyle, vo.getCompanyName()); this.createCell(row, cellIndex++, cellStyle, String.valueOf(index++)); if (detailScore.isEmpty()) { - this.createCell(row, cellIndex++, cellStyle, "-"); + for (JuryPrintVO memberVO : memberAll) { + this.createCell(row, cellIndex++, cellStyle, "-"); + } + this.createCell(row, cellIndex, cellStyle, "-"); } else { - BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getSupplierRegisterId())).findFirst().get(); + BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getId())).findFirst().orElseGet(BidEvalDetailSummaryVO::new); Map memberScoreMap = detailSummary.getScoreMap(); - for (MemberVO memberVO : memberAll) { - if (memberScoreMap.containsKey(memberVO.getUserId())) { + for (JuryPrintVO memberVO : memberAll) { + if (memberScoreMap != null && memberScoreMap.containsKey(memberVO.getUserId())) { BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); + } else { + this.createCell(row, cellIndex++, cellStyle, ""); } + + } + this.createCell(row, cellIndex, cellStyle, detailSummary.getFinalScore() == null ? "" : String.valueOf(detailSummary.getFinalScore())); + } + } + } + + //报价 + List detailScore = new ArrayList<>(); + + if (detailList.containsKey("0")) { + detailScore = detailList.get("0"); + } + sheet.createRow(rowIndex++); + SXSSFRow row = sheet.createRow(rowIndex++); + SXSSFCell c = row.createCell(0); + c.setCellValue("价格分数"); + + row = this.createRow(sheet, rowIndex++); + + this.createCell(row, 0, cellStyle, "投标人名称"); + this.createCell(row, 1, cellStyle, "投标序号"); + this.createCell(row, 2, cellStyle, "价格得分"); + + int index = 1; + for (BizSupplierRegister vo : suppliers) { + int cellIndex = 0; + row = sheet.createRow(rowIndex++); + this.createCell(row, cellIndex++, cellStyle, vo.getCompanyName()); + this.createCell(row, cellIndex++, cellStyle, String.valueOf(index++)); + + if (detailScore.isEmpty()) { + this.createCell(row, cellIndex++, cellStyle, "-"); + + } else { + BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getId())).findFirst().orElseGet(BidEvalDetailSummaryVO::new); + Map memberScoreMap = detailSummary.getScoreMap(); + for (JuryPrintVO memberVO : memberAll) { + if (memberScoreMap.containsKey(memberVO.getUserId())) { + BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); + this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); } } } - - //汇总 - sheet.createRow(rowIndex++); - row = sheet.createRow(rowIndex++); - c = row.createCell(0); - c.setCellValue("评分汇总表"); - - row = sheet.createRow(rowIndex++); - this.createCell(row, 0, cellStyle, "投标人名称"); - this.createCell(row, 1, cellStyle, "投标序号"); - this.createCell(row, 2, cellStyle, "商务得分"); - this.createCell(row, 3, cellStyle, "技术得分"); - this.createCell(row, 4, cellStyle, "服务得分"); - this.createCell(row, 5, cellStyle, "价格得分"); - this.createCell(row, 6, cellStyle, "综合得分"); - - index = 1; - for (SupplierRegisterVO vo : registerVOList) { - int cellIndex = 0; - row = sheet.createRow(rowIndex++); - this.createCell(row, cellIndex++, cellStyle, vo.getSupplierRegisterName()); - this.createCell(row, cellIndex++, cellStyle, String.valueOf(index++)); - - BigDecimal avgBd = - //商务 - scoreSummaryCell(row, cellIndex++, cellStyle, "1", detailList, vo.getSupplierRegisterId()) - //技术 - .add(scoreSummaryCell(row, cellIndex++, cellStyle, "2", detailList, vo.getSupplierRegisterId())) - //服务 - .add(scoreSummaryCell(row, cellIndex++, cellStyle, "5", detailList, vo.getSupplierRegisterId())) - //报价 - .add(scoreSummaryCell(row, cellIndex++, cellStyle, "0", detailList, vo.getSupplierRegisterId())); - this.createCell(row, cellIndex, cellStyle, String.valueOf(avgBd)); - } - - this.createRow(sheet, rowIndex++); - row = this.createRow(sheet, rowIndex++); - c = row.createCell(0); - c.setCellValue("全体评委签名:"); - - - this.createRow(sheet, rowIndex++); - row = this.createRow(sheet, rowIndex); - c = row.createCell(titles0.size() - 3); - c.setCellValue("日期:"); - c = row.createCell(titles0.size() - 2); - c.setCellValue(new SimpleDateFormat("yyyy年MM月dd日").format(new Date())); - - //合并表头 - CellRangeAddress region = new CellRangeAddress(0, 0, 0, titles0.size() - 1); - sheet.addMergedRegion(region); - - String filename = "打分汇总表.xlsx"; - 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(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1))); - wb.write(response.getOutputStream()); } + + //汇总 + sheet.createRow(rowIndex++); + row = sheet.createRow(rowIndex++); + c = row.createCell(0); + c.setCellValue("评分汇总表"); + + row = sheet.createRow(rowIndex++); + this.createCell(row, 0, cellStyle, "投标人名称"); + this.createCell(row, 1, cellStyle, "投标序号"); + this.createCell(row, 2, cellStyle, "商务得分"); + this.createCell(row, 3, cellStyle, "技术得分"); + this.createCell(row, 4, cellStyle, "服务得分"); + this.createCell(row, 5, cellStyle, "价格得分"); + this.createCell(row, 6, cellStyle, "综合得分"); + + index = 1; + for (BizSupplierRegister vo : suppliers) { + int cellIndex = 0; + row = sheet.createRow(rowIndex++); + this.createCell(row, cellIndex++, cellStyle, vo.getCompanyName()); + this.createCell(row, cellIndex++, cellStyle, String.valueOf(index++)); + + BigDecimal avgBd = + //商务 + scoreSummaryCell(row, cellIndex++, cellStyle, "1", detailList, vo.getId()) + //技术 + .add(scoreSummaryCell(row, cellIndex++, cellStyle, "2", detailList, vo.getId())) + //服务 + .add(scoreSummaryCell(row, cellIndex++, cellStyle, "5", detailList, vo.getId())) + //报价 + .add(scoreSummaryCell(row, cellIndex++, cellStyle, "0", detailList, vo.getId())); + this.createCell(row, cellIndex, cellStyle, String.valueOf(avgBd)); + } + + this.createRow(sheet, rowIndex++); + row = this.createRow(sheet, rowIndex++); + c = row.createCell(0); + c.setCellValue("全体评委签名:"); + + + this.createRow(sheet, rowIndex++); + row = this.createRow(sheet, rowIndex); + c = row.createCell(titles0.size() - 3); + c.setCellValue("日期:"); +// c = row.createCell(titles0.size() - 2); +// c.setCellValue(new SimpleDateFormat("yyyy年MM月dd日").format(new Date())); + + //合并表头 + CellRangeAddress region = new CellRangeAddress(0, 0, 0, titles0.size() - 1); + sheet.addMergedRegion(region); + + + String filename = new String((dictName + ".xlsx").getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + response.reset(); + response.setContentType("application/octet-stream;charset=utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=" + filename); + wb.write(response.getOutputStream()); + + } private SXSSFRow createRow(SXSSFSheet sheet, int rowIndex) { return sheet.createRow(rowIndex); } - private Cell createCell(Row row, int cellIndex, CellStyle style, String val) { + private void createCell(Row row, int cellIndex, CellStyle style, String val) { Cell cell = row.createCell(cellIndex); cell.setCellStyle(style); cell.setCellValue(val); - return cell; } @@ -300,7 +304,7 @@ public class DfhzExportServiceImpl implements ExportService { Cell c = row.createCell(cellIndex); c.setCellStyle(style); if (detailList.containsKey(cage)) { - BidEvalDetailSummaryVO summaryVO = detailList.get(cage).stream().filter(f -> f.getSupplierRegisterId().equals(supplierRegisterId)).findFirst().get(); + BidEvalDetailSummaryVO summaryVO = detailList.get(cage).stream().filter(f -> f.getSupplierRegisterId().equals(supplierRegisterId)).findFirst().orElseGet(BidEvalDetailSummaryVO::new); String score = "-"; if (summaryVO.getFinalScore() != null) { score = String.valueOf(summaryVO.getFinalScore()); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JgdfExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JgdfExportServiceImpl.java index c1a40f5..16279ba 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JgdfExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JgdfExportServiceImpl.java @@ -1,39 +1,43 @@ package com.chinaunicom.mall.ebtp.extend.export.service.impl; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; -import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; +import com.chinaunicom.mall.ebtp.common.poiExport.constant.ExportConstant; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTable; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTd; +import com.chinaunicom.mall.ebtp.common.poiExport.entity.ExcelTr; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.bean.JgdfExportData; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.TfileContentData; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.SupplierRegisterPriceScoreVO; import lombok.SneakyThrows; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; 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.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 价格打分 */ @Service("jgdf") +@Slf4j public class JgdfExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final ProjectFeignService projectFeignService; - public JgdfExportServiceImpl(RsmsFeignService rsmsFeignService, ProjectFeignService projectFeignService) { - this.rsmsFeignService = rsmsFeignService; - this.projectFeignService = projectFeignService; - } + + @Autowired + private ExportCommonFeignService commonFeignService; + /** * 导出 @@ -44,201 +48,119 @@ public class JgdfExportServiceImpl implements ExportService { */ @SneakyThrows @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("价格打分表,ExportParam = {}", JsonUtils.objectToJson(param)); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "价格打分表"); - List titles = new LinkedList<>(); - titles.add("序号"); - titles.add("应答人名称"); - titles.add("投标报价(元)"); - titles.add("评审价格(元)"); - titles.add("最低报价(元)"); - titles.add("投标平均价(元)"); - titles.add("价格得分"); + //查询包 + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + log.info("价格打分表 {},查询包信息 {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); + //查询项目 + ProjectRecordVO proj = commonFeignService.projectGetProjById(section.getProjectId()); + log.info("价格打分表 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(proj)); + //供应商信息 + List suppliers = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + log.info("价格打分表 {},查询供应商信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(suppliers)); + //查询报价信息 + List prices = commonFeignService.respsGetQuoteByRoomIdAndTurnSort(param); + log.info("价格打分表 {},查询报价信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(prices)); + Map priceMap = prices.stream().collect(Collectors.toMap(TfileContentData::getTendererId, Function.identity(), (o1, o2) -> o1)); - List keys = new LinkedList<>(); - keys.add("num"); - keys.add("ydName"); - keys.add("tbPrice"); - keys.add("psPrice"); - keys.add("lowPrice"); - keys.add("avgPrice"); - keys.add("jgScore"); + //报价评分 + List priceScores = commonFeignService.exportPrice(param); + log.info("价格打分表 {},查询报价评分 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(priceScores)); + Map priceScoreMap = priceScores.stream().collect(Collectors.toMap(SupplierRegisterPriceScoreVO::getSupplierRegisterId, Function.identity(), (o1, o2) -> o1)); - //项目和招标名称处理 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - BaseResponse list = projectFeignService.selectById(projectSectionVO); + ExcelTable table = new ExcelTable(dictName); + table.setFileName(dictName); + + List list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue(dictName).setCellStyleKey("noBorderCenter16").setIsRowMerge(true).setRowMergeNum(7)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("项目名称:" + proj.getProjectName()).setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(7)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("招标编号:" + Optional.ofNullable(proj.getAgencyCompanyProjectNum()).orElse(proj.getEbpProjectNumber())).setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(7)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("序号")); + list.add(new ExcelTd().setTdValue("应答人名称").setWidth(16 * 256)); + list.add(new ExcelTd().setTdValue("投标报价(元)")); + list.add(new ExcelTd().setTdValue("评审价格(元)")); + list.add(new ExcelTd().setTdValue("最低报价(元)")); + list.add(new ExcelTd().setTdValue("投标平均价(元)")); + list.add(new ExcelTd().setTdValue("价格得分")); + table.add(new ExcelTr().setExcelTdList(list)); - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(param.getReviewType()); - bidEvalDetailDTO.setAssessRoomId(param.getAssessRoomId()); - //价格数据 - BaseResponse> listBaseResponse = rsmsFeignService.findPriceScoreRecord(bidEvalDetailDTO); + //最小价格 + BigDecimal minPrice = prices.stream().map(o -> new BigDecimal(o.getBidContent())).min(Comparator.naturalOrder()).orElseGet(() -> new BigDecimal(0)); + //平均价格 + BigDecimal avgPrice = prices.stream().map(o -> new BigDecimal(o.getBidContent())).reduce(BigDecimal.ZERO, BigDecimal::add). + divide(BigDecimal.valueOf(prices.isEmpty() ? 1 : prices.size()), 2, BigDecimal.ROUND_HALF_UP); + List datas = new ArrayList<>(); + for (int i = 0; i < suppliers.size(); i++) { + BizSupplierRegister supplier = suppliers.get(i); - //组装价格数据 + JgdfExportData data = new JgdfExportData(); + data.setIndex(String.valueOf(i + 1)) + .setCompanyName(supplier.getCompanyName()); - if (listBaseResponse != null && listBaseResponse.getData() != null) { - - //最小价格 - BigDecimal minPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).min(Comparator.naturalOrder()).get(); - //平均价格 - BigDecimal avgPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).reduce(BigDecimal.ZERO, BigDecimal::add). - divide(BigDecimal.valueOf(listBaseResponse.getData().size()), 2, BigDecimal.ROUND_HALF_UP); - - ArrayList> maps = new ArrayList<>(); - - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("num", i + 1); - data.put("ydName", listBaseResponse.getData().get(i).getSupplierRegisterName()); - data.put("tbPrice", listBaseResponse.getData().get(i).getBidContent()); - data.put("psPrice", listBaseResponse.getData().get(i).getEvaluatingContent()); - if (i == 0) { - data.put("lowPrice", minPrice); - data.put("avgPrice", avgPrice); + if (priceMap.containsKey(supplier.getId())) { + TfileContentData tfileContentData = priceMap.get(supplier.getId()); + data.setBj(tfileContentData.getBidContent()) + .setPsj(tfileContentData.getEvaluatingContent()) + .setZdj(String.valueOf(minPrice)) + .setPjj(String.valueOf(avgPrice)); + if (priceScoreMap.containsKey(supplier.getId())) { + data.setBjdf(priceScoreMap.get(supplier.getId()).getPriceScore()); } else { - data.put("lowPrice", ""); - data.put("avgPrice", ""); + data.setBjdf(""); } - data.put("jgScore", listBaseResponse.getData().get(i).getPriceScore()); - maps.add(data); + } else { + data.setBj("") + .setPsj("") + .setZdj("") + .setPjj("") + .setBjdf(""); } - - // 创建工作簿 - SXSSFWorkbook wb = new SXSSFWorkbook(); - //表格样式 - CellStyle cellStyle = wb.createCellStyle(); - //水平居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //垂直居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //边框 - cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle.setBorderRight(BorderStyle.THIN);//右边框 - - // 创建表格, - Sheet sheet = wb.createSheet("价格打分"); - sheet.createFreezePane(1, 1); - - int rowIndex = 0; - int colIndex = 0; - - // 价格打分 - CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6); - sheet.addMergedRegion(region); - Row title0 = sheet.createRow(rowIndex++); - Cell titleCell0 = title0.createCell(0); - title0.setHeightInPoints(35); - titleCell0.setCellValue("价格打分表"); - titleCell0.setCellStyle(cellStyle); - //项目名称 - CellRangeAddress region1 = new CellRangeAddress(1, 1, 0, 6); - sheet.addMergedRegion(region1); - Row title1 = sheet.createRow(rowIndex++); - Cell titleCell1 = title1.createCell(0); - titleCell1.setCellValue("项目名称 : " + list.getData().getProjectName()); - //招标编号 - CellRangeAddress region2 = new CellRangeAddress(2, 2, 0, 6); - sheet.addMergedRegion(region2); - Row title2 = sheet.createRow(rowIndex++); - Cell titleCell2 = title2.createCell(0); - titleCell2.setCellValue("招标编号 : " + list.getData().getBidSectBizNum()); - - //标题行 - Row titleRow = sheet.createRow(rowIndex++); - // 设置高度为30 - titleRow.setHeightInPoints(30); - - for (String title : titles) { - sheet.setColumnWidth(colIndex, 17 * 256); - Cell titleCell = titleRow.createCell(colIndex++); - titleCell.setCellValue(title); - //设置样式 - titleCell.setCellStyle(cellStyle); - } - - - // 遍历结果数据 - for (Map item : maps) { - // 创建数据行 - Row activityRow = sheet.createRow(rowIndex++); - // 重置列索引 - colIndex = 0; - for (String key : keys) { - String value = item.get(key).toString(); - Cell valueCell = activityRow.createCell(colIndex++); - valueCell.setCellValue(value); - valueCell.setCellStyle(cellStyle);//设置样式 - } - - } - - - CellRangeAddress region3 = new CellRangeAddress(4, (4 + maps.size() - 1), 4, 4); - sheet.addMergedRegion(region3); - - CellRangeAddress region4 = new CellRangeAddress(4, (4 + maps.size() - 1), 5, 5); - sheet.addMergedRegion(region4); - - - //价格打分说明 - CellStyle cellStyle0 = wb.createCellStyle(); - //边框 - cellStyle0.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle0.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle0.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle0.setBorderRight(BorderStyle.THIN);//右边框 - cellStyle0.setVerticalAlignment(VerticalAlignment.CENTER); - String description = "价格打分说明 :"; - CellRangeAddress region5 = new CellRangeAddress((4 + maps.size()), (4 + maps.size()), 0, 6); - sheet.addMergedRegion(region5); - Row titleLast2 = sheet.createRow(rowIndex++); - titleLast2.setHeightInPoints(40); - for (int i = 0; i < 7; i++) { - Cell valueCell = titleLast2.createCell(i); - if (i == 0) { - valueCell.setCellValue(description); - } else { - valueCell.setCellValue(""); - } - valueCell.setCellStyle(cellStyle0); - } - - - //签名行 - Row titleLast1 = sheet.createRow(rowIndex++); - Cell titleCellLast1 = titleLast1.createCell(0); - titleCellLast1.setCellValue("全体委员签字 :"); - CellRangeAddress region6 = new CellRangeAddress((4 + maps.size() + 1), (4 + maps.size() + 1), 0, 6); - sheet.addMergedRegion(region6); - //时间行 - CellStyle cellStyle1 = wb.createCellStyle(); - cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - cellStyle1.setAlignment(HorizontalAlignment.RIGHT); - Row title6 = sheet.createRow(rowIndex++); - Cell titleCell6 = title6.createCell(0); - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy 年 MM 月 dd 日 "); - titleCell6.setCellValue("日期: " + sdf.format(date)); - titleCell6.setCellStyle(cellStyle1); - CellRangeAddress region7 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, 6); - sheet.addMergedRegion(region7); - - String filename = "价格打分.xlsx"; - 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(StandardCharsets.UTF_8), "ISO8859-1"))); - wb.write(response.getOutputStream()); - + datas.add(data); } -// return BaseResponse.fail(ERROR_MESSAGE); + + for (JgdfExportData data : datas) { + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue(data.getIndex())); + list.add(new ExcelTd().setTdValue(data.getCompanyName())); + list.add(new ExcelTd().setTdValue(data.getBj())); + list.add(new ExcelTd().setTdValue(data.getPsj())); + list.add(new ExcelTd().setTdValue(data.getZdj()).setColEqMerge(true)); + list.add(new ExcelTd().setTdValue(data.getPjj()).setColEqMerge(true)); + list.add(new ExcelTd().setTdValue(data.getBjdf())); + table.add(new ExcelTr().setExcelTdList(list)); + } + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("注:根据具体项目情况自行调整。").setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(7)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("全体评委签字:").setCellStyleKey("noBorderLeft12").setIsRowMerge(true).setRowMergeNum(7)); + table.add(new ExcelTr().setExcelTdList(list)); + + list = new ArrayList<>(); + list.add(new ExcelTd().setTdValue("日期:").setCellStyleKey("noBorderRight12").setIsRowMerge(true).setRowMergeNum(6)); + table.add(new ExcelTr().setExcelTdList(list)); + + + ExportConstant.exportFile(response, ExportConstant.generateExcelByTable(table)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesExportServiceImpl.java deleted file mode 100644 index 2de2db7..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesExportServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; -import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; -import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; -import com.deepoove.poi.XWPFTemplate; -import com.deepoove.poi.config.Configure; -import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import lombok.SneakyThrows; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 评标委员会签字表 - */ -@Service("judges") -public class JudgesExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final ProjectFeignService projectFeignService; - private final TemplateFileService templateFileService; - - public JudgesExportServiceImpl(RsmsFeignService rsmsFeignService, ProjectFeignService projectFeignService, TemplateFileService templateFileService) { - this.rsmsFeignService = rsmsFeignService; - this.projectFeignService = projectFeignService; - this.templateFileService = templateFileService; - } - - - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - @SneakyThrows - @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - - //项目和招标名称数据 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - BaseResponse list = projectFeignService.selectById(projectSectionVO); - //专家人员数据 - BaseResponse> listBaseResponse = rsmsFeignService.queryReportPrintByRoomId(param.getAssessRoomId()); - ArrayList> maps = new ArrayList<>(); - if (listBaseResponse != null && list != null) { - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("name", (listBaseResponse.getData().get(i).getName())); - data.put("phone", listBaseResponse.getData().get(i).getMobile()); - maps.add(data); - } - } - //获取模板 - InputStream file = templateFileService.getExportTemplet("judges"); - Map all = new HashMap() {{ - put("Judges", maps); - put("time", ""); - - if (list != null) { - put("bh", list.getData().getBidSectBizNum()); - put("mc", list.getData().getProjectName()); - } else { - put("bh", ""); - put("mc", ""); - } - }}; - - HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); - Configure config = Configure.builder().bind("Judges", policy).build(); - XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); - - String fileName = new String("评标委员会签字表.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - - OutputStream os = response.getOutputStream(); - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - template.write(os); - - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesPromiseImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesPromiseImpl.java new file mode 100644 index 0000000..464dce0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesPromiseImpl.java @@ -0,0 +1,53 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.impl; + +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; +import com.deepoove.poi.XWPFTemplate; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + + +/** + * 评标专家承诺书 + */ +@Service("promise") +@Slf4j +public class JudgesPromiseImpl implements ExportService { + + @Autowired + private TemplateFileService templateFileService; + + @Autowired + private ExportCommonFeignService commonFeignService; + + + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + @SneakyThrows + @Override + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "评标专家承诺书") + ".docx"; + //文件模板从数据库或者项目位置取得 + InputStream file = templateFileService.getExportTemplet("promise"); + XWPFTemplate template = XWPFTemplate.compile(file); + + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + + this.write(template, fileName, response); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignImpl.java new file mode 100644 index 0000000..375ca98 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignImpl.java @@ -0,0 +1,89 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.impl; + +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.JuryPrintVO; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.policy.HackLoopTableRenderPolicy; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * 评标委员会签字表 + */ +@Service("judgesSign") +@Slf4j +public class JudgesSignImpl implements ExportService { + + @Autowired + private ExportCommonFeignService commonFeignService; + + @Autowired + private TemplateFileService templateFileService; + + + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + @Override + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("评标委员会签字表,ExportParam = {}", JsonUtils.objectToJson(param)); + //项目和招标名称数据 + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + log.info("评标委员会签字表 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); + //专家人员数据 + List list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); + log.info("评标委员会签字表 {},查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list)); + ArrayList> maps = new ArrayList<>(); + + for (int i = 0; i < list.size(); i++) { + Map data = new HashMap<>(); + data.put("name", list.get(i).getName()); + data.put("phone", list.get(i).getMobile()); + maps.add(data); + } + + //获取模板 + Map all = new HashMap() {{ + put("Judges", maps); + put("time", ""); + + + put("bh", section.getBidSectBizNum()); + put("mc", section.getProjectName()); + + }}; + InputStream file = templateFileService.getExportTemplet("judgesSign"); +// File file = getExportTemplet("评标委员会签字表.docx"); + HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); + Configure config = Configure.builder().bind("Judges", policy).build(); + XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); + + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "评标委员会签字表") + ".docx"; + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + + this.write(template, fileName, response); + + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignInImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignInImpl.java new file mode 100644 index 0000000..602239e --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignInImpl.java @@ -0,0 +1,79 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.impl; + +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.JuryPrintVO; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.policy.HackLoopTableRenderPolicy; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.time.format.DateTimeFormatter; +import java.util.*; + + +/** + * 评审专家签到表 + */ +@Service("judgesSignIn") +@Slf4j +public class JudgesSignInImpl implements ExportService { + @Autowired + private TemplateFileService templateFileService; + @Autowired + private ExportCommonFeignService commonFeignService; + + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + @SneakyThrows + @Override + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("评审专家签到表,ExportParam = {}", JsonUtils.objectToJson(param)); + //专家人员数据 + List list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); + log.info("评标委员会签字表 {},查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list)); + ArrayList> maps = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + Map data = new HashMap<>(); + JuryPrintVO juryPrintVO = list.get(i); + data.put("name", juryPrintVO.getName()); + data.put("phone", juryPrintVO.getMobile()); + data.put("idCard", juryPrintVO.getCertificate()); + data.put("isTrue", Objects.equals(juryPrintVO.getAttitude(), 1) ? "是" : "否"); + data.put("time", juryPrintVO.getLoginTime() != null ? DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(juryPrintVO.getLoginTime()) : ""); + maps.add(data); + } + + + InputStream file = templateFileService.getExportTemplet("judgesSignIn"); + Map all = new HashMap() {{ + put("table", maps); + }}; + + HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); + Configure config = Configure.builder().bind("table", policy).build(); + XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "评审专家签到表") + ".docx"; + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + + this.write(template, fileName, response); + + + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/KbjlExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/KbjlExportServiceImpl.java deleted file mode 100644 index 774748f..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/KbjlExportServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.feign.OpenFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RespsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; -import com.deepoove.poi.XWPFTemplate; -import com.deepoove.poi.config.Configure; -import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import lombok.SneakyThrows; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 开标记录表导出 - */ -@Service("kbjl") -public class KbjlExportServiceImpl implements ExportService { - - private final ProjectFeignService projectFeignService; - private final RespsFeignService respsFeignService; - private final OpenFeignService openFeignService; - private final TemplateFileService templateFileService; - public KbjlExportServiceImpl(ProjectFeignService projectFeignService, RespsFeignService respsFeignService, OpenFeignService openFeignService, TemplateFileService templateFileService) { - this.projectFeignService = projectFeignService; - this.respsFeignService = respsFeignService; - this.openFeignService = openFeignService; - this.templateFileService = templateFileService; - } - - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - @SneakyThrows - @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - - Tdoc tdocPara = new Tdoc(); - tdocPara.setAssessRoomId(param.getAssessRoomId()); - tdocPara.setTurnSort(Integer.parseInt(param.getReviewTurnSort())); - //开标记录数据 - BaseResponse> listBaseResponse = respsFeignService.getTenderQuoteList(tdocPara); - ArrayList> maps = new ArrayList<>(); - - if (listBaseResponse != null) { - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("num", (i + 1)); - data.put("tbr", (listBaseResponse.getData().get(i).getBidUserName())); - data.put("bj", (listBaseResponse.getData().get(i).getNewPrice())); - data.put("yy", ""); - LocalDateTime signTime = listBaseResponse.getData().get(i).getSignTime(); - data.put("sign", signTime == null ? "" : (listBaseResponse.getData().get(i).getContactName()) + ":" + DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(signTime)); - maps.add(data); - } - - } - - //查询项目名称 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - BaseResponse project = projectFeignService.selectById(projectSectionVO); - - //查询开标时间 - BizBidOpenroom bizBidOpenroom = new BizBidOpenroom(); - bizBidOpenroom.setAssessRoomId(param.getAssessRoomId()); - BaseResponse> timeList = openFeignService.list(bizBidOpenroom); - - InputStream file = templateFileService.getExportTemplet("kbjl"); - Map all = new HashMap() {{ - put("Record", maps); - - if (timeList.getData() != null) { - put("time", timeList.getData().get(0).getOpingTime()); - } else { - put("time", ""); - } - - if (project.getData() != null) { - put("mc", project.getData().getProjectName()); - put("bh", project.getData().getBidSectBizNum()); - put("bao", project.getData().getBidSectName()); - } else { - put("mc", ""); - put("bh", ""); - put("bao", ""); - } - - put("yuan", ""); - }}; - - HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); - Configure config = Configure.builder().bind("Record", policy).build(); - XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); - - String fileName = new String("开标记录表.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - OutputStream os = response.getOutputStream(); - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - template.write(os); - } -} 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 deleted file mode 100644 index 0031208..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PbbgExportServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.enums.ExportExceptionEnum; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProcessFeignClient; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.TenderFeignService; -import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; -import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.ResultDetailVO; -import com.deepoove.poi.XWPFTemplate; -import com.deepoove.poi.config.Configure; -import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import lombok.SneakyThrows; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 评标报告 - */ -@Service("pbbg") -public class PbbgExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final TemplateFileService templateFileService; - private final ProcessFeignClient processFeignClient; - private final TenderFeignService tenderFeignService; - private final ProjectFeignService projectFeignClient; - - public PbbgExportServiceImpl(RsmsFeignService rsmsFeignService, TemplateFileService templateFileService, ProcessFeignClient processFeignClient, TenderFeignService tenderFeignService, ProjectFeignService projectFeignClient) { - this.rsmsFeignService = rsmsFeignService; - this.templateFileService = templateFileService; - this.processFeignClient = processFeignClient; - this.tenderFeignService = tenderFeignService; - this.projectFeignClient = projectFeignClient; - } - - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - @SneakyThrows - @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - BaseResponse processResponse = processFeignClient.getById(param.getAssessRoomId()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_ROOM_DETAIL_FAIL.customValid(!processResponse.isSuccess()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_ROOM_DETAIL_FAIL.assertNotNull(processResponse.getData()); - - BaseResponse proj = projectFeignClient.getProjById(processResponse.getData().getTpId()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_PROJECT_INFO.customValid(!proj.isSuccess()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_PROJECT_INFO.assertNotNull(proj.getData()); - ProjectRecordVO project = proj.getData(); - - - String zbfs = ""; - switch (project.getBidMethodDict()) { - case "procurement_mode_1": - case "procurement_mode_2": - zbfs = "公开招标"; - break; - case "procurement_mode_3": - zbfs = "公开比选"; - break; - case "procurement_mode_4": - zbfs = "招募"; - break; - case "procurement_mode_5": - case "procurement_mode_6": - zbfs = "谈判"; - break; - case "procurement_mode_7": - zbfs = "询价"; - break; - case "procurement_mode_8": - zbfs = "竞拍"; - break; - default: - zbfs = ""; - } - - - BaseResponse> roomTenderResponse = tenderFeignService.queryRoomTenderCount(param.getAssessRoomId()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_TENDERL_FAIL.customValid(!roomTenderResponse.isSuccess()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_TENDERL_FAIL.assertNotNull(roomTenderResponse.getData()); - List registerList = roomTenderResponse.getData(); - //表一 - List> list1 = new ArrayList<>(); - for (int i = 0; i < registerList.size(); i++) { - Map map = new HashMap<>(16); - int num = i + 1; - BizSupplierRegister register = registerList.get(i); - map.put("num", num); - map.put("name", register.getCompanyName()); - map.put("type", StrUtil.isBlank(register.getDownloadStatus()) ? "" : "2".equals(register.getDownloadStatus()) ? "已投递" : "1".equals(register.getDownloadStatus()) ? "已下载" : "未下载"); - list1.add(map); - } - - //表二假数据 - List> list2 = new ArrayList<>(); - for (int i = 0; i < 3; i++) { - Map map = new HashMap<>(); - map.put("time", "2021.3.4"); - map.put("nr", "好多内容"); - list2.add(map); - } - - - //表三数据 - //专家人员数据 - BaseResponse> listBaseResponse = rsmsFeignService.queryReportPrintByRoomId(param.getAssessRoomId()); - ArrayList> list3 = new ArrayList<>(); - String pbwyhzz = ""; - if (listBaseResponse != null && listBaseResponse.getData() != null) { - List juryPrintVOList = listBaseResponse.getData(); - for (int i = 0; i < juryPrintVOList.size(); i++) { - int num = i + 1; - JuryPrintVO juryPrintVO = juryPrintVOList.get(i); - Map data = new HashMap<>(); - data.put("num", num); - data.put("work", juryPrintVO.getWorkunit()); - data.put("name", juryPrintVO.getName()); - data.put("job", juryPrintVO.getJobTitle()); - data.put("unit", juryPrintVO.getWorkunit()); - list3.add(data); - if ("2".equals(juryPrintVO.getDuty())) { - pbwyhzz = juryPrintVO.getName(); - } - } - - } - - - BaseResponse> baseResponse = rsmsFeignService.get(param.getAssessRoomId()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_ROOM_DETAIL_FAIL.customValid(!baseResponse.isSuccess()); - ExportExceptionEnum.FRAME_EXCEPTION_GET_ROOM_DETAIL_FAIL.assertNotNull(baseResponse.getData()); - List resultDetails = baseResponse.getData(); - - if (resultDetails.isEmpty()) { - return; - } - int size = resultDetails.size(); - - List> list4 = new ArrayList<>(); - List> list5 = new ArrayList<>(); - List> list6 = new ArrayList<>(); - List> list7 = new ArrayList<>(); - List> list8 = new ArrayList<>(); - for (int i = 0; i < size; i++) { - int num = i + 1; - ResultDetailVO detail = resultDetails.get(i); - String tbr = detail.getCompanyName(); - Map map = new HashMap<>(16); - //表4,初步评审结果 投标人,投标结果 - map.put("num", num); - map.put("tbr", tbr); - map.put("jg", detail.getFirstRvwResult() == null ? "" : detail.getFirstRvwResult() == 0 ? "未通过" : "通过"); - list4.add(map); - - //表六 详细评审数据 投标人,技术分,商务分 - - map.put("js", StrUtil.isNotBlank(detail.getTechnicalScore()) ? detail.getTechnicalScore() : ""); - map.put("sw", StrUtil.isNotBlank(detail.getBusinessScore()) ? detail.getBusinessScore() : ""); - list6.add(map); - - - //表七 价格评审数据 投标人,投标价,评审价格,价格得分 - - map.put("bj", detail.getPrice() == null ? BigDecimal.ZERO : detail.getPrice()); - map.put("psjg", detail.getPriceReview() == null ? BigDecimal.ZERO : detail.getPriceReview()); - map.put("jgdf", StrUtil.isNotBlank(detail.getPriceScore()) ? detail.getPriceScore() : ""); - list7.add(map); - - - //表八 评审总结数据 - map.put("jgdf2", StrUtil.isNotBlank(detail.getPriceScore()) ? detail.getPriceScore() : ""); - map.put("zhdf", StrUtil.isNotBlank(detail.getTotalScore()) ? detail.getTotalScore() : ""); - list8.add(map); - - } - - - String finalZbfs = zbfs; - String finalPbwyhzz = pbwyhzz; - Map all = new HashMap() {{ - put("table1", list1); - put("table2", list2); - put("table3", list3); - put("table4", list4); - put("table5", list5); - put("table6", list6); - put("table7", list7); - put("table8", list8); - put("zbdljg", project.getTenderAgencyName()); - put("zbbh", project.getEbpProjectNumber()); - put("zbfs", finalZbfs); - put("pbwyhzz", finalPbwyhzz); - }}; - - - HackLoopTableRenderPolicy policy1 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy2 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy3 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy4 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy5 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy6 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy7 = new HackLoopTableRenderPolicy(); - HackLoopTableRenderPolicy policy8 = new HackLoopTableRenderPolicy(); - - Configure config = Configure.builder().bind("table1", policy1).bind("table2", policy2).bind("table3", policy3) - .bind("table4", policy4).bind("table5", policy5).bind("table6", policy6) - .bind("table7", policy7).bind("table8", policy8).build(); - - - InputStream file = templateFileService.getExportTemplet("pbbg"); -// File file = getExportTemplet("评标报告.docx"); - XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); - - String fileName = new String("评标报告.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - OutputStream os = response.getOutputStream(); - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - template.write(os); - - } - - private List getFirstArchiveLinks() { - List archiveLinks = new ArrayList<>(); - //初步评审表URL - archiveLinks.add(new ArchiveLink().setId("1").setArchiveDirectory("1")); - return archiveLinks; - } - - private List getDetailArchiveLinks() { - List archiveLinks = new ArrayList<>(); - //详细评审表URL -// archiveLinks.add(new ArchiveLink().setId("2").setArchiveDirectory("2")); - //专家打分表URL - archiveLinks.add(new ArchiveLink().setId("3").setArchiveDirectory("3")); - //价格打分表URL - archiveLinks.add(new ArchiveLink().setId("4").setArchiveDirectory("4")); - //打分汇总表URL - archiveLinks.add(new ArchiveLink().setId("5").setArchiveDirectory("5")); - //评审报告URL -// archiveLinks.add(new ArchiveLink().setId("6").setArchiveDirectory("6")); - return archiveLinks; - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PszjExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PszjExportServiceImpl.java deleted file mode 100644 index 5e7e2ed..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/PszjExportServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; -import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; -import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; -import com.deepoove.poi.XWPFTemplate; -import com.deepoove.poi.config.Configure; -import com.deepoove.poi.policy.HackLoopTableRenderPolicy; -import lombok.SneakyThrows; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 评审专家签到表 - */ -@Service("pszj") -public class PszjExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final TemplateFileService templateFileService; - - public PszjExportServiceImpl(RsmsFeignService rsmsFeignService, TemplateFileService templateFileService) { - this.rsmsFeignService = rsmsFeignService; - this.templateFileService = templateFileService; - } - - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - @SneakyThrows - @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - - //专家人员数据 - BaseResponse> listBaseResponse = rsmsFeignService.queryReportPrintByRoomId(param.getAssessRoomId()); - - ArrayList> maps = new ArrayList<>(); - if (listBaseResponse != null && listBaseResponse.getData() != null) { - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("name", listBaseResponse.getData().get(i).getName()); - data.put("phone", listBaseResponse.getData().get(i).getMobile()); - data.put("idCard", listBaseResponse.getData().get(i).getCertificate()); - data.put("isTrue", listBaseResponse.getData().get(i).getAttitude() == 1 ? "是" : "否"); - data.put("time", DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(listBaseResponse.getData().get(i).getLoginTime())); - maps.add(data); - } - } - - - InputStream file = templateFileService.getExportTemplet("pszj"); - Map all = new HashMap() {{ - put("table", maps); - }}; - - HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); - Configure config = Configure.builder().bind("table", policy).build(); - XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); - - String fileName = new String("评审专家签到表.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - - OutputStream os = response.getOutputStream(); - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - template.write(os); - - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java new file mode 100644 index 0000000..f483e3c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java @@ -0,0 +1,200 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; +import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.JuryPrintVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.ResultDetailVO; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.policy.HackLoopTableRenderPolicy; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + + +/** + * 评审报告 + */ +@Service("reviewReport") +@Slf4j +public class ReviewReportImpl implements ExportService { + + @Autowired + private ExportCommonFeignService commonFeignService; + + @Autowired + private TemplateFileService templateFileService; + + + /** + * 导出 + * + * @param param + * @param request + * @param response + */ + @SneakyThrows + @Override + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("评审报告,ExportParam = {}", JsonUtils.objectToJson(param)); + // 项目信息 + ProjectRecordVO project = commonFeignService.projectGetProjById(param.getProjectId()); + log.info("评审报告 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(project)); + + String zbfs = ""; + switch (project.getBidMethodDict()) { + case "procurement_mode_1": + case "procurement_mode_2": + zbfs = "公开招标"; + break; + case "procurement_mode_3": + zbfs = "公开比选"; + break; + case "procurement_mode_4": + zbfs = "招募"; + break; + case "procurement_mode_5": + case "procurement_mode_6": + zbfs = "谈判"; + break; + case "procurement_mode_7": + zbfs = "询价"; + break; + case "procurement_mode_8": + zbfs = "竞拍"; + break; + default: + zbfs = ""; + } + + + //供应商信息 + List registerList = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + log.info("初步评审表 {},查询供应商信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(registerList)); + //表一 + List> list1 = new ArrayList<>(); + for (int i = 0; i < registerList.size(); i++) { + Map map = new HashMap<>(16); + int num = i + 1; + BizSupplierRegister register = registerList.get(i); + map.put("num", num); + map.put("name", register.getCompanyName()); + map.put("type", StrUtil.isBlank(register.getDownloadStatus()) ? "" : "2".equals(register.getDownloadStatus()) ? "已投递" : "1".equals(register.getDownloadStatus()) ? "已下载" : "未下载"); + list1.add(map); + } + + //表二 专家人员数据 + List memberList = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); + log.info("评审报告 {},查询专家人员信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(memberList)); + ArrayList> list2 = new ArrayList<>(); + String pbwyhzz = null; + for (int i = 0; i < memberList.size(); i++) { + JuryPrintVO juryPrintVO = memberList.get(i); + Map data = new HashMap<>(); + data.put("num", i + 1); + data.put("work", juryPrintVO.getWorkunit()); + data.put("name", juryPrintVO.getName()); + data.put("job", juryPrintVO.getJobTitle()); + data.put("unit", juryPrintVO.getWorkunit()); + list2.add(data); + if ("2".equals(juryPrintVO.getDuty())) { + pbwyhzz = juryPrintVO.getName(); + } + } + + ArrayList> list3 = new ArrayList<>(); + + for (int i = 0; i < registerList.size(); i++) { + Map map = new HashMap<>(16); + int num = i + 1; + BizSupplierRegister register = registerList.get(i); + map.put("num", num); + map.put("id", register.getCompanyId()); + map.put("tbr", register.getCompanyName()); + list3.add(map); + + } + + //评审结果表数据 + List resultDetails = commonFeignService.rsmsQueryReviewDetailByRoomId(param.getAssessRoomId()); + log.info("评审报告 {},查询评审结果表数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(resultDetails)); + Map detailVOMap = resultDetails.stream().collect(Collectors.toMap(ResultDetailVO::getCompanyId, Function.identity(), (o1, o2) -> o1)); + for (int i = 0; i < registerList.size(); i++) { + BizSupplierRegister register = registerList.get(i); + if (detailVOMap.containsKey(register.getCompanyId())) { + ResultDetailVO detail = detailVOMap.get(register.getCompanyId()); + + Map map = list3.stream().filter(f -> f.get("id").equals(register.getCompanyId())).findAny().orElse(new HashMap<>()); + //表三,初步评审结果 投标人,投标结果 + map.put("jg", detail.getFirstRvwResult() == null ? "" : detail.getFirstRvwResult() == 0 ? "未通过" : "通过"); + + + //表四 详细评审数据 投标人,技术分,商务分 + map.put("js", StrUtil.isNotBlank(detail.getTechnicalScore()) ? detail.getTechnicalScore() : ""); + map.put("sw", StrUtil.isNotBlank(detail.getBusinessScore()) ? detail.getBusinessScore() : ""); + + + //表五 价格评审数据 投标人,投标价,评审价格,价格得分 + map.put("bj", detail.getPrice() == null ? BigDecimal.ZERO : detail.getPrice()); + map.put("psjg", detail.getPriceReview() == null ? BigDecimal.ZERO : detail.getPriceReview()); + map.put("jgdf", StrUtil.isNotBlank(detail.getPriceScore()) ? detail.getPriceScore() : ""); + + + //表六 评审总结数据 + map.put("jgdf2", StrUtil.isNotBlank(detail.getPriceScore()) ? detail.getPriceScore() : ""); + map.put("zhdf", StrUtil.isNotBlank(detail.getTotalScore()) ? detail.getTotalScore() : ""); + } + } + + String finalZbfs = zbfs; + String finalPbwyhzz = pbwyhzz; + Map all = new HashMap() {{ + put("table1", list1); + put("table2", list2); + put("table3", list3); + put("zbdljg", project.getTenderAgencyName()); + put("zbbh", project.getEbpProjectNumber()); + put("zbfs", finalZbfs); + put("pbwyhzz", finalPbwyhzz == null ? "______" : finalPbwyhzz); + }}; + + + HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); + + Configure config = Configure.builder() + .bind("table1", policy) + .bind("table2", policy) + .bind("table3", policy) + .build(); + + + InputStream file = templateFileService.getExportTemplet("reviewReport"); +// File file = getExportTemplet("评标报告.docx"); + XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "评标报告") + ".docx"; + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + + this.write(template, fileName, response); + } + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java deleted file mode 100644 index 080c789..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; - -import com.chinaunicom.mall.ebtp.common.util.JsonUtils; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; -import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; -import com.deepoove.poi.XWPFTemplate; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; - - -/** - * 评标专家承诺书 - */ -@Service("zjcn") -@Slf4j -public class ZjcnExportServiceImpl implements ExportService { - - private final TemplateFileService templateFileService; - - public ZjcnExportServiceImpl(TemplateFileService templateFileService) { - this.templateFileService = templateFileService; - } - - /** - * 导出 - * - * @param param - * @param request - * @param response - */ - @SneakyThrows - @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - log.info("评标专家承诺书:{}", JsonUtils.objectToJson(param)); - //文件模板从数据库或者项目位置取得 - InputStream file = templateFileService.getExportTemplet("zjcn"); - log.info("获取模板:{}", file); - XWPFTemplate template = XWPFTemplate.compile(file); - log.info("template:{}", template); - - String fileName = new String("评标专家承诺书.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); - log.info("fileName:{}", fileName); - OutputStream os = response.getOutputStream(); - - response.setHeader("Content-disposition", "attachment; filename=" + fileName); - log.info("开始write"); - template.write(os); - - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java index 8099fc0..de20076 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java @@ -1,17 +1,21 @@ package com.chinaunicom.mall.ebtp.extend.export.service.impl; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.*; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProjectFeignService; -import com.chinaunicom.mall.ebtp.extend.export.feign.RsmsFeignService; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParam; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.chinaunicom.mall.ebtp.extend.export.service.common.ExportCommonFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.BidEvalDetailVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.JuryPrintVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.ReviewConfigCategoryDTO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.ReviewConfigDetailDTO; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -24,20 +28,18 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 专家个人打分表/评委打分表 */ @Service("zjgr") +@Slf4j public class ZjgrExportServiceImpl implements ExportService { - private final RsmsFeignService rsmsFeignService; - private final ProjectFeignService projectFeignService; - public ZjgrExportServiceImpl(RsmsFeignService rsmsFeignService, ProjectFeignService projectFeignService) { - this.rsmsFeignService = rsmsFeignService; - this.projectFeignService = projectFeignService; - } + @Autowired + private ExportCommonFeignService commonFeignService; /** * 导出 @@ -48,35 +50,34 @@ public class ZjgrExportServiceImpl implements ExportService { */ @SneakyThrows @Override - public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { - + public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { + log.info("专家个人打分表,ExportParam = {}", JsonUtils.objectToJson(param)); //查询项目名称 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(param.getSectionId()); - BaseResponse list = projectFeignService.selectById(projectSectionVO); - - - BidEvalInfoDTO bidEvalInfoDTO = new BidEvalInfoDTO(); - bidEvalInfoDTO.setAssessRoomId(param.getAssessRoomId()); - bidEvalInfoDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalInfoDTO.setReviewType(param.getReviewType()); - - //供应商 - List listBaseResponse = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO).getData(); + ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); + log.info("专家个人打分表 {},查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); + //供应商信息 + List suppliers = commonFeignService.tenderGetSupplierRegisterByRoomId(param.getAssessRoomId()); + log.info("专家个人打分表 {},查询供应商信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(suppliers)); //评委 - List members = listBaseResponse.stream().findFirst().get().getMembers(); + List members = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); + log.info("专家个人打分表 {},查询评委信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(members)); + param.setUserList(members.stream().map(JuryPrintVO::getUserId).collect(Collectors.toList())); + + //打分数据 + Map> map = commonFeignService.exportDetail(param); + log.info("专家个人打分表 {},查询打分数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(map)); //列头 - StringBuffer titles0 = new StringBuffer("分类,项目名称,标准说明,分值"); + StringBuilder titles0 = new StringBuilder("分类,类别名称,标准说明,分值"); //供应商 顺序 ArrayList strings = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.size(); i++) { - strings.add(listBaseResponse.get(i).getSupplierRegisterId()); - titles0.append(",").append(listBaseResponse.get(i).getSupplierRegisterName()); + for (BizSupplierRegister supplier : suppliers) { + strings.add(supplier.getId()); + titles0.append(",").append(supplier.getCompanyName()); } String titles = titles0.toString(); //最右侧列值 - Integer index = (titles.split(",").length) - 1; + int index = (titles.split(",").length) - 1; // 创建工作簿 @@ -92,19 +93,14 @@ public class ZjgrExportServiceImpl implements ExportService { cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 cellStyle.setBorderTop(BorderStyle.THIN);//上边框 cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + cellStyle.setWrapText(true); //Sheet - for (int i = 0; i < members.size(); i++) { - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - - bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(param.getReviewType()); - bidEvalDetailDTO.setCreateBy(members.get(i).getUserId()); - BaseResponse> scoreRecord = rsmsFeignService.findScoreRecord(bidEvalDetailDTO); - List dataList = scoreRecord.getData(); + for (JuryPrintVO member : members) { + String userid = member.getUserId(); + List dataList = map.containsKey(userid) ? map.get(userid) : new ArrayList<>(); // 创建表格 - Sheet sheet = wb.createSheet(members.get(i).getName()); - sheet.createFreezePane(1, 1); + Sheet sheet = wb.createSheet(member.getName()); int rowIndex = 0; int colIndex = 0; // 1行 @@ -113,33 +109,31 @@ public class ZjgrExportServiceImpl implements ExportService { Row title1 = sheet.createRow(rowIndex++); Cell titleCell1 = title1.createCell(0); title1.setHeightInPoints(35); - titleCell1.setCellValue(list.getData().getProjectName()); - titleCell1.setCellStyle(cellStyle); + titleCell1.setCellValue(section.getProjectName()); // 2行 CellRangeAddress region2 = new CellRangeAddress(1, 1, 0, index); sheet.addMergedRegion(region2); Row title2 = sheet.createRow(rowIndex++); Cell titleCell2 = title2.createCell(0); titleCell2.setCellValue("评委打分表"); - titleCell2.setCellStyle(cellStyle); //3行 CellRangeAddress region3 = new CellRangeAddress(2, 2, 0, index); sheet.addMergedRegion(region3); Row title3 = sheet.createRow(rowIndex++); Cell titleCell3 = title3.createCell(0); - titleCell3.setCellValue("包名 :" + list.getData().getBidSectName()); + titleCell3.setCellValue("包名 :" + section.getBidSectName()); //4行 CellRangeAddress region4 = new CellRangeAddress(3, 3, 0, index); sheet.addMergedRegion(region4); Row title4 = sheet.createRow(rowIndex++); Cell titleCell4 = title4.createCell(0); - titleCell4.setCellValue("评标委员会成员:" + members.get(i).getName()); + titleCell4.setCellValue("评标委员会成员:" + member.getName()); //5行 列头 Row titleRow5 = sheet.createRow(rowIndex++); // 设置高度为30 titleRow5.setHeightInPoints(30); for (String title : titles.split(",")) { - sheet.setColumnWidth(colIndex, 17 * 256); + sheet.setColumnWidth(colIndex, 16 * 256); Cell titleCell = titleRow5.createCell(colIndex++); titleCell.setCellValue(title); //设置样式 @@ -216,7 +210,7 @@ public class ZjgrExportServiceImpl implements ExportService { //倒第2行 Row title5 = sheet.createRow(rowIndex++); Cell titleCell5 = title5.createCell(0); - titleCell5.setCellValue("评标委员会成员(" + members.get(i).getName() + ")签字:"); + titleCell5.setCellValue("评标委员会成员(" + member.getName() + ")签字:"); CellRangeAddress region5 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, index); sheet.addMergedRegion(region5); //最后一行 @@ -234,11 +228,12 @@ public class ZjgrExportServiceImpl implements ExportService { } - String filename = "评标打分表.xlsx"; - filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); + //导出的表格名称 + String dictName = commonFeignService.exportDictName(param.getId(), "评标打分表") + ".xlsx"; + String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); response.reset(); response.setContentType("application/octet-stream;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes(StandardCharsets.UTF_8), "ISO8859-1"))); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); wb.write(response.getOutputStream()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/policy/DetailTablePolicy.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/policy/DetailTablePolicy.java new file mode 100644 index 0000000..5923943 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/policy/DetailTablePolicy.java @@ -0,0 +1,80 @@ +package com.chinaunicom.mall.ebtp.extend.export.service.policy; + +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportTableData; +import com.deepoove.poi.data.CellRenderData; +import com.deepoove.poi.data.RowRenderData; +import com.deepoove.poi.policy.DynamicTableRenderPolicy; +import com.deepoove.poi.policy.TableRenderPolicy; +import com.deepoove.poi.util.TableTools; +import org.apache.poi.xwpf.usermodel.XWPFTable; +import org.apache.poi.xwpf.usermodel.XWPFTableCell; +import org.apache.poi.xwpf.usermodel.XWPFTableRow; + +import java.util.List; + +public class DetailTablePolicy extends DynamicTableRenderPolicy { + + // 横向填充名称所在行 + private int horizonalNameIndex = 0; + // 竖向填充数据所在行 + private int verticallyStartIndex = 1; + + public DetailTablePolicy() { + } + + public DetailTablePolicy(int horizonalNameIndex, int verticallyStartIndex) { + this.horizonalNameIndex = horizonalNameIndex; + this.verticallyStartIndex = verticallyStartIndex; + } + + @Override + public void render(XWPFTable xwpfTable, Object o) throws Exception { + if (o == null) { + return; + } + ExportTableData data = (ExportTableData) o; + + + //供应商名称 + List cols = data.getCells(); + if (cols != null) { + XWPFTableRow row = xwpfTable.getRow(horizonalNameIndex); + row.removeCell(row.getTableCells().size() - 1); + //循环添加供应商名称 + for (CellRenderData col : cols) { + XWPFTableCell cell = row.createCell(); + // 单元格渲染 + TableRenderPolicy.Helper.renderCell(cell, col, null); + } + } + + //供应商 + List rows = data.getRows(); + if (rows != null && !rows.isEmpty()) { + xwpfTable.removeRow(verticallyStartIndex); + for (int i = 0; i < rows.size(); i++) { + XWPFTableRow insertNewTableRow = xwpfTable.insertNewTableRow(verticallyStartIndex + i); + for (int j = 0; j < rows.get(i).getCells().size(); j++) { + insertNewTableRow.createCell(); + } + TableRenderPolicy.Helper.renderRow(xwpfTable.getRow(verticallyStartIndex + i), rows.get(i)); + } + } + + if (data.getCellMerge() != null) { + // 水平合并 + data.getCellMerge().getMapping().forEach((key, value) -> { + TableTools.mergeCellsHorizonal(xwpfTable, key.getI(), key.getJ(), value.getJ()); + }); + } + + if (data.getRowMerge() != null) { + // 垂直合并 + data.getCellMerge().getMapping().forEach((key, value) -> { + TableTools.mergeCellsVertically(xwpfTable, key.getI(), key.getJ(), value.getJ()); + }); + } + + + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/TemplateFileService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/TemplateFileService.java similarity index 75% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/TemplateFileService.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/TemplateFileService.java index a326845..ed82fe6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/TemplateFileService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/TemplateFileService.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.service; +package com.chinaunicom.mall.ebtp.extend.export.service.templateFile; import java.io.InputStream; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/TemplateFileServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/impl/TemplateFileServiceImpl.java similarity index 88% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/TemplateFileServiceImpl.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/impl/TemplateFileServiceImpl.java index 1b8344c..642c0dd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/TemplateFileServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/templateFile/impl/TemplateFileServiceImpl.java @@ -1,7 +1,7 @@ -package com.chinaunicom.mall.ebtp.extend.export.service.impl; +package com.chinaunicom.mall.ebtp.extend.export.service.templateFile.impl; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; -import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; +import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateWarehouse; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.BizBidTemplateWarehouseService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailConsistentVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailConsistentVO.java deleted file mode 100644 index 50e6288..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailConsistentVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Map; - -/** - * 一致性检查 - * - * @author dino - * @date 2020/12/23 10:11 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="BidEvalDetailConsistentVO对象", description="一致性检查VO对象") -public class BidEvalDetailConsistentVO implements Serializable { - - @ApiModelProperty(value = "校验项") - private String scoreItem; - - @ApiModelProperty(value = "供应商名称") - private String supplierRegisterName; - - @ApiModelProperty(value = "专家评分") - private Map scoreMap; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewFlowVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewFlowVO.java deleted file mode 100644 index da2ab93..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewFlowVO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ReviewFlowVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 项目id - */ - @ApiModelProperty(value = "项目id") - private String tpId; - - /** - * 标包id - */ - @ApiModelProperty(value = "标包id") - private String sectionId; - - /** - * 评审室ID - */ - @ApiModelProperty(value = "评审室ID") - private String assessRoomId; - - /** - * 评审室ID - */ - @ApiModelProperty(value = "评审室轮次") - private Integer assessRoomSort; - - /** - * 流程ID - */ - @ApiModelProperty(value = "流程ID") - private String flowId; - - /** - * 流程状态1:进行中;2:已结束; - */ - @ApiModelProperty(value = "流程状态-1:进行中;2:已结束;") - private Integer flowStatus; - - /** - * 轮次ID - */ - @ApiModelProperty(value = "轮次ID") - private String turnId; - - /** - * 评审轮次实例名称 - */ - @ApiModelProperty(value = "评审轮次实例名称") - private String turnName; - - /** - * 评审轮次实例顺序 - */ - @ApiModelProperty(value = "评审轮次实例顺序") - private Integer turnSort; - - /** - * 轮次状态-1:进行中;2:已结束;3:未开启; - */ - @ApiModelProperty(value = "轮次状态-1:进行中;2:已结束;3:未开启;") - private Integer turnStatus; - - /** - * 节点ID - */ - @ApiModelProperty(value = "节点ID") - private String nodeId; - - /** - * 评审节点实例顺序 - */ - @ApiModelProperty(value = "评审节点实例顺序") - private Integer nodeSort; - - /** - * 节点状态-1:进行中;2:已结束;3:未开启; - */ - @ApiModelProperty(value = "节点状态-1:进行中;2:已结束;3:未开启;") - private Integer nodeStatus; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewResultDetailSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewResultDetailSummaryVO.java deleted file mode 100644 index 9d0c93d..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ReviewResultDetailSummaryVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 评审结果汇总 - * - * @author dino - * @date 2020/12/19 13:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="ReviewResultDetailSummaryVO对象", description="详审汇总提交初始化VO对象") -public class ReviewResultDetailSummaryVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "报名表id(biz_bid_register)") - @JsonSerialize(using = ToStringSerializer.class) - private String supplierRegisterId; - - @ApiModelProperty(value = "供应商名称") - private String supplierRegisterName; - - @ApiModelProperty(value = "报价(元)") - private BigDecimal price; - - @ApiModelProperty(value = "评审价(元)") - private BigDecimal reviewPrice; - - @ApiModelProperty(value = "商务得分") - private BigDecimal businessScore; - - @ApiModelProperty(value = "技术得分") - private BigDecimal technologyScore; - - @ApiModelProperty(value = "服务得分") - private BigDecimal serviceScore; - - @ApiModelProperty(value = "报价分") - private BigDecimal priceScore; - - @ApiModelProperty(value = "最终得分") - private BigDecimal finalScore; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java index 5f32239..87fbd34 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java @@ -1,7 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; -import com.chinaunicom.mall.ebtp.extend.feign.factory.FeignConfiguration; -import com.chinaunicom.mall.ebtp.extend.feign.factory.DocumentCenterServiceFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.config.FeignConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -9,31 +9,31 @@ import org.springframework.web.bind.annotation.RequestParam; /** * 连接山分的文档中心服务 - * + * * @author Ajaxfan */ @FeignClient(value = "${mconfig.feign.name.documentcenter}", - fallbackFactory = DocumentCenterServiceFallbackFactory.class, - configuration = FeignConfiguration.class) + fallbackFactory = DocumentCenterServiceFallbackFactory.class, + configuration = FeignConfiguration.class) public interface DocumentCenterService { - /** - * 通过附件id查询明细 - * - * @param fileId - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadFileAllStream") - String getObjectDetail(@RequestParam("fileId") String fileId); + /** + * 通过附件id查询明细 + * + * @param fileId + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadFileAllStream") + String getObjectDetail(@RequestParam("fileId") String fileId); - /** - * 通过附件id查询明细 - * - * @param fileId - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadStream") - String getFileObjectDetail(@RequestParam("fileId") String fileId); + /** + * 通过附件id查询明细 + * + * @param fileId + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadStream") + String getFileObjectDetail(@RequestParam("fileId") String fileId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProcessFeignService.java similarity index 62% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProcessFeignService.java index 75340b4..4e32790 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProcessFeignClient.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProcessFeignService.java @@ -1,34 +1,29 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; +package com.chinaunicom.mall.ebtp.extend.feign.client; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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.ResultDetailVO; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.ProcessFeignFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizAssessRoom; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import java.util.List; - /** * 评审流程 */ @FeignClient(value = "${mconfig.feign.name.process}", fallbackFactory = ProcessFeignFallbackFactory.class) -public interface ProcessFeignClient { - +public interface ProcessFeignService { /** - * 查询数据 + * 通过room_id查询评审室信息 * * @param id - * * @return */ - @ApiOperation(value = "getById",notes = "通过ID查询评审室信息") + @ApiOperation(value = "getById", notes = "通过ID查询评审室信息") @GetMapping("/v1/bizassessroom/{id}") public BaseResponse getById(@ApiParam(value = "主键id", required = true) @PathVariable String id); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProjectFeignService.java similarity index 70% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProjectFeignService.java index ddb8d5f..92ce112 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/ProjectFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/ProjectFeignService.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; +package com.chinaunicom.mall.ebtp.extend.feign.client; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.ProjectFeignFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.RequestBody; /** * 调用 PROJECT_SERVICE */ -@FeignClient(value = "${mconfig.feign.name.project}",fallbackFactory = ProjectFeignFallbackFactory.class) +@FeignClient(value = "${mconfig.feign.name.project}", fallbackFactory = ProjectFeignFallbackFactory.class) public interface ProjectFeignService { /** - * * @param projectSection 项目标段查询 * @return 返回结果 */ @PostMapping("/v1/projectSection/selectById") BaseResponse selectById(@RequestBody ProjectSectionVO projectSection); + /** * 根据id查询项目信息 * diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RespsFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RespsFeignService.java new file mode 100644 index 0000000..5f6921c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RespsFeignService.java @@ -0,0 +1,39 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.ExportServiceRespsFallbakFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.Tdoc; +import com.chinaunicom.mall.ebtp.extend.feign.entity.TfileContentData; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +/** + * 调用 RESPS_SERVICE + */ +@FeignClient(value = "${mconfig.feign.name.resps}", fallbackFactory = ExportServiceRespsFallbakFactory.class) +public interface RespsFeignService { + + /** + * 开标唱标页列表 + * + * @param tdocPara assessRoomId 评审室id turnSort 轮次序号 + * @return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + @PostMapping("/v1/tfile/getOpenTenderList") + public BaseResponse getOpenTenderList(@ApiParam(value = "assessRoomId 评审室id turnSort 轮次序号", required = false) @RequestBody Tdoc tdocPara); + + + /** + * 评审查看报价 + * + * @param param + * @return + */ + @PostMapping("/v1/tfile/getQuoteByRoomIdAndTurnSort") + public BaseResponse> getQuoteByRoomIdAndTurnSort(@RequestBody Tdoc param); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java new file mode 100644 index 0000000..0eb9b01 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java @@ -0,0 +1,80 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.ExportServiceFallback; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.*; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +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 java.util.List; +import java.util.Map; + +/** + * 调用 RSMS_SERVICE + */ +@FeignClient(value = "${mconfig.feign.name.rsms}", fallbackFactory = ExportServiceFallback.class) +public interface RsmsFeignService { + + + @ApiOperation("报表打印-通过评审室Id查询评委会成员数据及签到数据") + @GetMapping("v1/jury/report/print/{roomId}") + BaseResponse> queryReportPrintByRoomId(@ApiParam(value = "roomId", required = true) @PathVariable String roomId); + + + /** + * 通过评审室查询detail表数据 + * + * @param assessRoomId + * @return + */ + @ApiOperation("通过评审室查询detail表数据") + @GetMapping("/v1/reviewresult/queryDetailByRoomId/{assessRoomId}") + BaseResponse> get(@ApiParam(value = "评审室id", required = true) @PathVariable String assessRoomId); + + + /** + * 初审汇总 + * + * @param roomId 评审室ID + * @return + * @date 2021年4月27日 + */ + @GetMapping("/v1/bid/report/exportEarly/{roomId}") + BaseResponse> exportEarly(@ApiParam(value = "评审室ID", required = true) @PathVariable("roomId") String roomId); + + /** + * 打分汇总表 + * + * @param roomId 评审室ID + * @date 2021年4月27日 + */ + @GetMapping("/v1/bid/report/exportScoreSummary/{roomId}") + BaseResponse>> exportScoreSummary(@PathVariable("roomId") String roomId); + + /** + * 价格打分表 + * + * @param roomId 评审室ID + * @date 2021年4月27日 + */ + @GetMapping("/v1/bid/report/exportPrice/{roomId}") + public BaseResponse> exportPrice(@PathVariable("roomId") String roomId); + + /** + * 不同供应商的打分 + * + * @param bidEvalCategoryDTO + * @return + * @date 2021年4月28日 + */ + @PostMapping("/v1/bid/report/exportDetail") + BaseResponse>> exportDetail(@RequestBody BidEvalCategoryDTO bidEvalCategoryDTO); + +} + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/TenderFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java similarity index 80% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/TenderFeignService.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java index fef0b15..753aeab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/TenderFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign; +package com.chinaunicom.mall.ebtp.extend.feign.client; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; -import com.chinaunicom.mall.ebtp.extend.export.feign.factory.TenderFeignFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.TenderFeignFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/UsercenterFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/UsercenterFeignService.java new file mode 100644 index 0000000..32bba29 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/UsercenterFeignService.java @@ -0,0 +1,23 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.UsercenterFeignFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.LoginUserDetailVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + + +/** + * 用户中心 + */ +@FeignClient(value = "${mconfig.feign.name.usercenter}", fallbackFactory = UsercenterFeignFallbackFactory.class) +public interface UsercenterFeignService { + /* + * 查询用户信息 + */ + @GetMapping("/v1.0/user/info") + BaseResponse getLoninUserDetail(@RequestParam("uid") String uid); + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/DocumentCenterServiceFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/DocumentCenterServiceFallbackFactory.java similarity index 80% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/DocumentCenterServiceFallbackFactory.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/DocumentCenterServiceFallbackFactory.java index d23317b..8ecc694 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/DocumentCenterServiceFallbackFactory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/DocumentCenterServiceFallbackFactory.java @@ -1,7 +1,7 @@ -package com.chinaunicom.mall.ebtp.extend.feign.factory; +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; -import com.chinaunicom.mall.ebtp.extend.feign.fallback.DocumentCenterServiceFallbackImpl; +import com.chinaunicom.mall.ebtp.extend.feign.client.fallback.DocumentCenterServiceFallbackImpl; import feign.hystrix.FallbackFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java new file mode 100644 index 0000000..e3e412e --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java @@ -0,0 +1,86 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.RsmsFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.rsms.*; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Component +@Slf4j +public class ExportServiceFallback implements FallbackFactory { + + @Override + public RsmsFeignService create(Throwable throwable) { + RsmsFeignService back = new RsmsFeignService() { + @Override + public BaseResponse> queryReportPrintByRoomId(String roomId) { + return null; + } + + /** + * 通过评审室查询detail表数据 + * + * @param assessRoomId + * @return + */ + @Override + public BaseResponse> get(String assessRoomId) { + return null; + } + + /** + * 初审汇总 + * + * @param roomId 评审室ID + * @return + * @date 2021年4月27日 + */ + @Override + public BaseResponse> exportEarly(String roomId) { + return null; + } + + /** + * 打分汇总表 + * + * @param roomId 评审室ID + * @date 2021年4月27日 + */ + @Override + public BaseResponse>> exportScoreSummary(String roomId) { + return null; + } + + /** + * 价格打分表 + * + * @param roomId 评审室ID + * @date 2021年4月27日 + */ + @Override + public BaseResponse> exportPrice(String roomId) { + return null; + } + + /** + * 不同供应商的打分 + * + * @param bidEvalCategoryDTO + * @return + * @date 2021年4月28日 + */ + @Override + public BaseResponse>> exportDetail(BidEvalCategoryDTO bidEvalCategoryDTO) { + return null; + } + }; + log.error(ExceptionUtil.stacktraceToString(throwable)); + return null; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceRespsFallbakFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceRespsFallbakFactory.java new file mode 100644 index 0000000..9e6f8c7 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceRespsFallbakFactory.java @@ -0,0 +1,48 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.RespsFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.Tdoc; +import com.chinaunicom.mall.ebtp.extend.feign.entity.TfileContentData; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +@Slf4j +public class ExportServiceRespsFallbakFactory implements FallbackFactory { + @Override + public RespsFeignService create(Throwable throwable) { + RespsFeignService resps = new RespsFeignService() { + /** + * 开标唱标页列表 + * + * @param tdocPara assessRoomId 评审室id turnSort 轮次序号 + * @return title-表格标题,dataDecrypt-解密状态id、status dataQuote-报价信息 + */ + @Override + public BaseResponse getOpenTenderList(Tdoc tdocPara) { + return BaseResponse.fail(new HashMap()); + } + + /** + * 评审查看报价 + * + * @param param + * @return + */ + @Override + public BaseResponse> getQuoteByRoomIdAndTurnSort(Tdoc param) { + return BaseResponse.fail(new ArrayList<>()); + } + }; + log.error(ExceptionUtil.stacktraceToString(throwable)); + return null; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProcessFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProcessFeignFallbackFactory.java similarity index 59% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProcessFeignFallbackFactory.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProcessFeignFallbackFactory.java index 2f64c6e..42f5588 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProcessFeignFallbackFactory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProcessFeignFallbackFactory.java @@ -1,23 +1,21 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.common.util.JsonUtils; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizAssessRoom; -import com.chinaunicom.mall.ebtp.extend.export.feign.ProcessFeignClient; -import com.chinaunicom.mall.ebtp.extend.export.vo.ReviewFlowVO; +import com.chinaunicom.mall.ebtp.extend.feign.client.ProcessFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizAssessRoom; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @Component @Slf4j -public class ProcessFeignFallbackFactory implements FallbackFactory { +public class ProcessFeignFallbackFactory implements FallbackFactory { @Override - public ProcessFeignClient create(Throwable throwable) { - ProcessFeignClient back = new ProcessFeignClient() { + public ProcessFeignService create(Throwable throwable) { + ProcessFeignService back = new ProcessFeignService() { /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProjectFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProjectFeignFallbackFactory.java similarity index 79% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProjectFeignFallbackFactory.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProjectFeignFallbackFactory.java index ffce41a..de83209 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/ProjectFeignFallbackFactory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ProjectFeignFallbackFactory.java @@ -1,10 +1,10 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -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.ProjectFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.client.ProjectFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectRecordVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/TenderFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/TenderFeignFallbackFactory.java similarity index 81% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/TenderFeignFallbackFactory.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/TenderFeignFallbackFactory.java index 38e302a..f02050a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/feign/factory/TenderFeignFallbackFactory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/TenderFeignFallbackFactory.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.extend.export.feign.factory; +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; -import com.chinaunicom.mall.ebtp.extend.export.feign.TenderFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.client.TenderFeignService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.BizSupplierRegister; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/UsercenterFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/UsercenterFeignFallbackFactory.java new file mode 100644 index 0000000..613db52 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/UsercenterFeignFallbackFactory.java @@ -0,0 +1,19 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.extend.feign.client.UsercenterFeignService; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class UsercenterFeignFallbackFactory implements FallbackFactory { + + @Override + public UsercenterFeignService create(Throwable throwable) { + UsercenterFeignService back = uid -> null; + log.error(ExceptionUtil.stacktraceToString(throwable)); + return back; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/fallback/DocumentCenterServiceFallbackImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java similarity index 87% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/feign/fallback/DocumentCenterServiceFallbackImpl.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java index 79a9a62..4a3ffd2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/fallback/DocumentCenterServiceFallbackImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java @@ -1,12 +1,10 @@ -package com.chinaunicom.mall.ebtp.extend.feign.fallback; +package com.chinaunicom.mall.ebtp.extend.feign.client.fallback; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.List; - /** * 熔断 * diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/FeignConfiguration.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/config/FeignConfiguration.java similarity index 81% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/FeignConfiguration.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/config/FeignConfiguration.java index 712e402..58f0ad7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/factory/FeignConfiguration.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/config/FeignConfiguration.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.feign.factory; +package com.chinaunicom.mall.ebtp.extend.feign.config; import com.alibaba.fastjson.JSONObject; import com.chinaunicom.mall.ebtp.extend.feign.utils.UrlConstants; @@ -20,29 +20,29 @@ import java.net.URL; @Slf4j @Configuration -public class FeignConfiguration implements RequestInterceptor { +public class FeignConfiguration implements RequestInterceptor { @Override public void apply(RequestTemplate requestTemplate) { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if(attributes!=null){ + if (attributes != null) { HttpServletRequest request = attributes.getRequest(); - log.info("token=======requestTemplate.headers"+requestTemplate.headers()); + log.info("token=======requestTemplate.headers" + requestTemplate.headers()); String access_token = request.getHeader("Authorization"); - log.info("token======="+access_token); - if(access_token==null || StringUtils.isBlank(access_token)){ + log.info("token=======" + access_token); + if (access_token == null || StringUtils.isBlank(access_token)) { access_token = getAccessToken(); - log.info("token=======access_token==="+access_token); - requestTemplate.header(HttpHeaders.AUTHORIZATION, "Bearer "+access_token); + log.info("token=======access_token===" + access_token); + requestTemplate.header(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); } - }else{ + } else { String access_token = getAccessToken(); - log.info("token=======attributes==null==="+access_token); - requestTemplate.header(HttpHeaders.AUTHORIZATION, "Bearer "+access_token); + log.info("token=======attributes==null===" + access_token); + requestTemplate.header(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); } } - public static String getAccessToken () { + public static String getAccessToken() { StringBuffer strBf = new StringBuffer(); try { URL realUrl = new URL(UrlConstants.clientHttpUrl); @@ -78,13 +78,13 @@ public class FeignConfiguration implements RequestInterceptor { } reader.close(); connection.disconnect(); - log.info("toke返回数据:---------------------- "+strBf.toString()); + log.info("toke返回数据:---------------------- " + strBf.toString()); } catch (Exception e) { - log.info("toke返回数据:---------------------- "+e.getMessage()); + log.info("toke返回数据:---------------------- " + e.getMessage()); } - JSONObject json=JSONObject.parseObject(strBf.toString()); - if((boolean)json.get("success")){ - return ((JSONObject)json.get("data")).get("value").toString(); + JSONObject json = JSONObject.parseObject(strBf.toString()); + if ((boolean) json.get("success")) { + return ((JSONObject) json.get("data")).get("value").toString(); } return null; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizAssessRoom.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizAssessRoom.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizAssessRoom.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizAssessRoom.java index dcaa94a..43ac113 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizAssessRoom.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizAssessRoom.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizSupplierRegister.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizSupplierRegister.java new file mode 100644 index 0000000..3378ede --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BizSupplierRegister.java @@ -0,0 +1,288 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Map; + +/** + * 实体类 BizSupplierRegister + * + * @auto.generated + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "biz_supplier_register", autoResultMap = true) +@ApiModel(value = "BizSupplierRegister对象", description = "供应商报名登记表") +public class BizSupplierRegister extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 供应商报名登记表id + */ + @TableId + @ApiModelProperty(value = "供应商报名登记表id") + private String id; + + /** + * 项目表id + */ + @ApiModelProperty(value = "项目表id") + private String projectId; + + /** + * 标包id + */ + @ApiModelProperty(value = "标包id") + private String packageId; + + /** + * 评审室表id + */ + @ApiModelProperty(value = "评审室表id") + private String assessRoomId; + + /** + * 评审室轮次 + */ + @ApiModelProperty(value = "评审室轮次") + private Integer assessRoomSort; + /** + * 机构id + */ + @ApiModelProperty(value = "机构id") + private String companyId; + + /** + * 机构名称 + */ + @ApiModelProperty(value = "机构名称") + private String companyName; + + /** + * 投标人id + */ + @ApiModelProperty(value = "投标人id") + private String bidUserId; + + /** + * 投标人姓名 + */ + @ApiModelProperty(value = "投标人姓名") + private String bidUserName; + + /** + * 联系人id + */ + @ApiModelProperty(value = "联系人id") + private String contactId; + + /** + * 报名状态[1:已报名提交][2:已报名审核][3:已报名被拒绝][4:已退出][5:已中标][6:未中标][9:重评前的数据] + */ + @ApiModelProperty(value = "报名状态[1:已报名提交][2:已报名审核][3:已报名被拒绝][4:已退出][5:已中标][6:未中标][9:重评前的数据]") + private String registerStatus; + + /** + * 报名时间 + */ + @ApiModelProperty(value = "报名时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime registerTime; + + + /** + * 下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件] + */ + @ApiModelProperty(value = "下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件]") + private String downloadStatus; + + /** + * 下载时间 + */ + @ApiModelProperty(value = "下载时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime downloadTime; + + /** + * 下载版本 + */ + @ApiModelProperty(value = "下载版本") + private String downloadVersion; + + /** + * 上传时间 + */ + @ApiModelProperty(value = "上传时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime uploadTime; + + /** + * 解密状态:[1:未解密][2:解密成功][3:解密失败] + */ + @ApiModelProperty(value = "解密状态:[1:未解密][2:解密成功][3:解密失败]") + private String decryptStatus; + + /** + * 解密时间 + */ + @ApiModelProperty(value = "解密时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime decryptTime; + + /** + * 营业执照id,附件表 + */ + @ApiModelProperty(value = "营业执照id,附件表") + private String businessLicenseId; + + /** + * 法人代表授权书id,附件表 + */ + @ApiModelProperty(value = "法人代表授权书id,附件表") + private String legalPersionAuthorizationId; + + /** + * 退出原因 + */ + @ApiModelProperty(value = "退出原因") + private String quitReason; + + /** + * 购标时间 + */ + @ApiModelProperty(value = "购标时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime payTime; + + /** + * 购标状态:[1:未支付][2:已支付][3:支付失败] + */ + @ApiModelProperty(value = "购标状态:[1:未支付][2:已支付][3:支付失败]") + private String payStatus; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "1:预审;2:资审") + private Integer roomType; + + /** + * 报价总金额净价 offer_total_price + */ + @ApiModelProperty(value = "报价总金额净价") + private BigDecimal offerTotalPrice; + + /** + * 报价总金额含税价 offer_total_tax_price + */ + @ApiModelProperty(value = "报价总金额含税价") + private BigDecimal offerTotalTaxPrice; + + /** + * 报价单号 + */ + @ApiModelProperty(value = "报价单号") + private String offerOrderNo; + + @ApiModelProperty(value = "招募状态:0非招募、1招募单轮、2招募多轮") + private String recruitType; + + /** + * 联系人名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "联系人名称") + private String contactName; + + /** + * 联系电话 + */ + @TableField(exist = false) + @ApiModelProperty(value = "联系电话") + private String contactTelephone; + + /** + * 联系传真 + */ + @TableField(exist = false) + @ApiModelProperty(value = "联系传真") + private String contactFax; + + /** + * 签字确认账号id + */ + @TableField(exist = false) + @ApiModelProperty(value = "签字确认账号id") + private String signUserId; + + /** + * 轮次id + */ + @TableField(exist = false) + @ApiModelProperty(value = "轮次id") + private String reviewTurnId; + + /** + * 轮次序号 + */ + @TableField(exist = false) + @ApiModelProperty(value = "轮次序号") + private String reviewTurnSort; + + /** + * 签字确认账号名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "签字确认账号名称") + private String signUserName; + + /** + * 签字确认时间 + */ + + @ApiModelProperty(value = "签字确认时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(exist = false, typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime signTime; + + /** + * 其他下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件] + */ + @TableField(exist = false) + @ApiModelProperty(value = "下载状态:[0:未下载标书][1:已下载标书][2:已上传投标文件]") + private String downloadOtherStatus; + + private Map dataMap; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/LoginUserDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/LoginUserDetailVO.java new file mode 100644 index 0000000..05306a8 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/LoginUserDetailVO.java @@ -0,0 +1,118 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * @author 邵智敬 + * @date 2019-04-25 + * @version: V1.0 + * @update [序号][日期YYYY-MM-DD] [更改人姓名][变更描述] + */ + +@Data +@Accessors(chain = true) +@ApiModel(value = "用户名获取用户信息、权限字信息、角色信息") +public class LoginUserDetailVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "租户ID") + private String tenantId; + @ApiModelProperty(value = "部门编码,根据门户现状,位数不规则,部分沿用HR原编码") + private String ou; + @ApiModelProperty(value = "部门名称") + private String ouName; + + @ApiModelProperty(value = "所属省份ou") + private String province; + + @ApiModelProperty(value = "所属城市名称ou") + private String city; + + @ApiModelProperty(value = "所属省份名称") + private String provinceName; + + @ApiModelProperty(value = "所属城市名称") + private String cityName; + + @ApiModelProperty(value = "门户全国目录中的唯一编码 uid") + private String staffId; + + @ApiModelProperty(value = "空即可") + private String staffOrgId; + + @ApiModelProperty(value = "eshop_portaluser的cn") + private String username; + + @ApiModelProperty(value = "用户密码") + private String password; + @ApiModelProperty(value = "公司ID") + private String orgId; + @ApiModelProperty(value = "eshop_portaluser的cn") + private String staffName; + + @ApiModelProperty(value = "租户ID") + private String staffType; + + @ApiModelProperty(value = "租户ID") + private Boolean enabled; + + @ApiModelProperty(value = "权限字列表") + private List authoritiesList; + + @ApiModelProperty(value = "用户") + private Long userid; + + @ApiModelProperty(value = "机构id") + private String partnerId; + + @ApiModelProperty(value = "机构名称") + private String partnerName; + + @ApiModelProperty("是否前台综合员:Y-是, N-否") + private String isSyntheser; + + @ApiModelProperty("是否是资产管理员:Y-是, N-否") + private String isAsseter; + + @ApiModelProperty("是否采购员:Y-是, N-否") + private String isCurement; + + @ApiModelProperty("身份证号吗") + private String identityCard; + + @ApiModelProperty("联系电话") + private String tel; + + @ApiModelProperty("公司名称") + private String orgName; + + @ApiModelProperty("当前及所有上级组织ou集合") + private List ouList; + + @ApiModelProperty("邮箱") + private String cumail; + + @ApiModelProperty("当前用户ou") + private String currentOu; + + @ApiModelProperty("当前用户岗位名称") + private String currentOuDisplay; + + @ApiModelProperty("省份简称") + private String site; + + @ApiModelProperty(value = "HR员工编码(非正式用户无该信息)") + private String employeenumber; + + @ApiModelProperty("手机号") + private String mobile; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectRecordVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectRecordVO.java similarity index 99% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectRecordVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectRecordVO.java index f4f0496..617613d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectRecordVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectRecordVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSection.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSection.java index 6e1e392..f3f536c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSection.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -50,7 +50,7 @@ public class ProjectSection extends BaseEntity implements Serializable { * 标段包业务编号:招标项目业务编号/1 */ @ApiModelProperty(value = "标段包业务编号:招标项目业务编号/1") - @Length(max = 50,message = "业务编号最长为50字符") + @Length(max = 50, message = "业务编号最长为50字符") private String bidSectBizNum; /** @@ -63,14 +63,14 @@ public class ProjectSection extends BaseEntity implements Serializable { * 标段(包)名称 */ @ApiModelProperty(value = "标段(包)名称") - @Length(max = 200,message = "标段(包)名称最长为200字符") + @Length(max = 200, message = "标段(包)名称最长为200字符") private String bidSectName; /** * 标段(包)内容 */ @ApiModelProperty(value = "标段(包)内容") - @Length(max = 2000,message = "内容描述最长为2000字符") + @Length(max = 2000, message = "内容描述最长为2000字符") private String bidSectContent; /** @@ -83,7 +83,7 @@ public class ProjectSection extends BaseEntity implements Serializable { * 标包预算 */ @ApiModelProperty(value = "标包预算") - @Length(max = 20,message = "标包预算最长为20位") + @Length(max = 20, message = "标包预算最长为20位") private BigDecimal bidSectContractPrice; /** @@ -114,7 +114,7 @@ public class ProjectSection extends BaseEntity implements Serializable { * 投标人资格条件 */ @ApiModelProperty(value = "投标人资格条件") - @Length(max = 1000,message = "投标人资格条件最长为1000字符") + @Length(max = 1000, message = "投标人资格条件最长为1000字符") private String bidderQual; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSectionVO.java similarity index 97% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSectionVO.java index 2d41d06..493de6c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/ProjectSectionVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/Tdoc.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/Tdoc.java new file mode 100644 index 0000000..fc20b6c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/Tdoc.java @@ -0,0 +1,139 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +/** + * 实体类 Tdoc-目录主表 + * + * @author yss + */ +@Data +@Accessors(chain = true) +@TableName(value = "biz_resps_tdoc", autoResultMap = true) +@ApiModel(value = "Tdoc对象", description = "目录主表") +public class Tdoc implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "") + private String id; + + @ApiModelProperty(value = "临时表id") + private String tempId; + + @ApiModelProperty(value = "项目id") + private String tpId; + + @ApiModelProperty(value = "标段id") + private String sectionId; + + @ApiModelProperty(value = "评审室id") + private String assessRoomId; + + @ApiModelProperty(value = "评审室轮次") + private Integer assessRoomSort; + + @ApiModelProperty(value = "轮次id") + private String turnId; + + @ApiModelProperty(value = "轮次") + private Integer turnSort; + + @ApiModelProperty(value = "报价或其他:0-报价 1-其他 空是全部") + private Integer quoteOrOther; + + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "评审类型 1-预审 2-后审 ") + private Integer roomType; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "应答开始时间") + private LocalDateTime startDate; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "应答截止时间") + private LocalDateTime endDate; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "解密截止时间") + private LocalDateTime decryptEndDate; + + @ApiModelProperty(value = "结束状态 0-否 1-是 只有谈判室内的有") + private Integer endStatus; + @ApiModelProperty(value = "版本号") + private Integer version; + + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建者") + private String createBy; + + @TableField(fill = FieldFill.INSERT, typeHandler = CustomLocalDateTimeTypeHandler.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private LocalDateTime createDate; + + @TableField(fill = FieldFill.UPDATE, typeHandler = CustomLocalDateTimeTypeHandler.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateDate; + + /** + * 标段id + */ + @TableField(exist = false) + private List sectionIdList; + /** + * 目录表 + */ + @TableField(exist = false) + private List catalogList; + /** + * 是否重评 false-否,true-是 + */ + @TableField(exist = false) + private Boolean reAssess; + + @ApiModelProperty(value = "文档存储路径") + private String filepath; + + @ApiModelProperty(value = "文档名称") + private String filename; + + @TableField(exist = false) + @ApiModelProperty(value = "投标人id") + private String tendererId; + + @TableField(exist = false) + @ApiModelProperty(value = "投标人id") + private String commpanyId; + @TableField(exist = false) + private List catalogIdList; + + @TableField(exist = false) + private Map key_key; + + @TableField(exist = false) + @ApiModelProperty(value = "解密状态:true-全部已解密,false-仍有未解密,供应商开标页:true-可以解密 false-未设置解密截止时间或已过解密时间") + private boolean decryptStatus; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TdocCatalog.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TdocCatalog.java new file mode 100644 index 0000000..2cbdbf7 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TdocCatalog.java @@ -0,0 +1,63 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * 实体类 TdocCatalog-目录表 + * + * @author yss + */ +@Data +@Accessors(chain = true) +@TableName(value = "biz_resps_tdoc_catalog", autoResultMap = true) +public class TdocCatalog implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "") + private String id; + + @ApiModelProperty(value = "目录主表id") + private String tdocId; + + @ApiModelProperty(value = "父id") + private String parentId; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "目录类型:0-商务、1-技术、2-服务、3-报价、4-其他、5-引用供应商信息库") + private Integer catalogType; + + @ApiModelProperty(value = "文件类型:0-普通、1-结构化、2-报价一览表") + private Integer structureType; + + @ApiModelProperty(value = "引用的编码") + private String quoteCode; + + @ApiModelProperty(value = "排序") + private Integer sort; + + /** + * 树结构使用 + */ + @TableField(exist = false) + private List children; + + @TableField(exist = false) + private String path; + + @ApiModelProperty(value = "评审室id") + @TableField(exist = false) + private String assessRoomId; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TfileContentData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TfileContentData.java new file mode 100644 index 0000000..ea65a91 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/TfileContentData.java @@ -0,0 +1,75 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 实体类 TfileContentData-投标人投标数据,报价表数据 + * + * @author yss + */ +@Data +@Accessors(chain = true) +@TableName(value = "biz_resps_tfile_content_data", autoResultMap = true) +public class TfileContentData implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "") + private String id; + + @ApiModelProperty(value = "主目录id") + private String tdocId; + + @ApiModelProperty(value = "投标人投标内容id") + private String tendererConttentId; + + @ApiModelProperty(value = "行id,说明是一项报价") + private String rowId; + + @ApiModelProperty(value = "结构化表格id") + private String contTid; + + @ApiModelProperty(value = "投标数据或报价总金额净价") + private String bidContent; + + @ApiModelProperty(value = "评标数据:可能报价微调整,默认投标数据 或报价总金额含税") + private String evaluatingContent; + + @ApiModelProperty(value = "投标人id") + private String tendererId; + + @ApiModelProperty(value = "供应商名称") + private String tendererName; + + @ApiModelProperty(value = "内容性质:1-报价表、0-分项报价表") + private Integer properties; + + @ApiModelProperty(value = "数据类型:0-评审价 1-数值型 2-文本型") + private Integer dataType; + + @ApiModelProperty(value = "投标人投标文件表id") + private String tendererFileId; + @ApiModelProperty(value = "录入报价的备注") + private String remark; + + @ApiModelProperty(value = "评审室id") + @TableField(exist = false) + private String assessRoomId; + + @ApiModelProperty(value = "轮次") + @TableField(exist = false) + private Integer turnSort; + + public BigDecimal getEvaluating() { + return this.dataType == 0 ? new BigDecimal(this.evaluatingContent) : BigDecimal.ZERO; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEarlyWarn.java similarity index 89% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEarlyWarn.java index 4f84e02..c9bf479 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEarlyWarn.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -25,8 +25,8 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEarlyWarn对象", description="有效供应商少于3家提醒说明") -@TableName(value = "biz_rsms_bid_early_warn",autoResultMap = true) +@ApiModel(value = "BidEarlyWarn对象", description = "有效供应商少于3家提醒说明") +@TableName(value = "biz_rsms_bid_early_warn", autoResultMap = true) public class BidEarlyWarn extends BaseEntity implements Serializable { private static final Long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategory.java new file mode 100644 index 0000000..8bff3df --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategory.java @@ -0,0 +1,56 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 评标类别表 + *

+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value = "BidEvalCategory对象", description = "评标类别表DTO") +@TableName(value = "biz_rsms_bid_eval_category", autoResultMap = true) +public class BidEvalCategory extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "编号") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "评标主表id(biz_rsms_bid_eval_info)") + @JsonSerialize(using = ToStringSerializer.class) + private String bidEvalId; + + @ApiModelProperty(value = "详审项类别:0:报价;1:商务;2:技术;4:工程报价 ;5:服务。初审项类别:0:形式评审;1:资格审查项;2:响应性评审;3:商务审查项;4: 技术审查项;5: 服务审查项;6: 其他审查项") + private String category; + + @ApiModelProperty(value = "评审配置类别表ID(biz_rsms_review_config_category)") + @JsonSerialize(using = ToStringSerializer.class) + private String categoryId; + + @ApiModelProperty(value = "评委类别状态 1,未提交;2,已提交") + private String judgesStatus; + + @ApiModelProperty(value = "评委姓名") + private String judgesName; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategoryDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategoryDTO.java new file mode 100644 index 0000000..fd03f28 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalCategoryDTO.java @@ -0,0 +1,53 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + *

+ * 评标类别表 + *

+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value = "BidEvalCategoryDTO对象", description = "评标类别表") +public class BidEvalCategoryDTO extends BidEvalCategory implements Serializable { + + private static final Long serialVersionUID = 1L; + + + @ApiModelProperty(value = "评分配置集合") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private List detailList; + + @ApiModelProperty(value = "报价得分") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private Map priceScoreMap; + + /** + * 解锁的评委ID + */ + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private List userIds; + + @ApiModelProperty(value = "评审室Id") + @JsonSerialize(using = ToStringSerializer.class) + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String assessRoomId; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailJudgesSummaryVO.java similarity index 87% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailJudgesSummaryVO.java index b8d3c2f..021a7fd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailJudgesSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailJudgesSummaryVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -21,7 +21,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalDetailJudgesSummaryVO对象", description="详审专家汇总VO对象") +@ApiModel(value = "BidEvalDetailJudgesSummaryVO对象", description = "详审专家汇总VO对象") public class BidEvalDetailJudgesSummaryVO implements Serializable { private static final Long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailSummaryVO.java similarity index 87% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailSummaryVO.java index 49575e4..109575f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailSummaryVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -23,7 +23,7 @@ import java.util.Map; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalDetailSummaryVO对象", description="详审汇总VO对象") +@ApiModel(value = "BidEvalDetailSummaryVO对象", description = "详审汇总VO对象") public class BidEvalDetailSummaryVO implements Serializable { private static final Long serialVersionUID = 1L; @@ -43,7 +43,7 @@ public class BidEvalDetailSummaryVO implements Serializable { @ApiModelProperty(value = "专家评分") @JsonInclude(JsonInclude.Include.NON_EMPTY) - List scoreList; + private List scoreList; @ApiModelProperty(value = "详审专家汇总") @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailVO.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailVO.java index 2b7f54e..a289a65 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalDetailVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -21,7 +21,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalDetailVO对象", description="评标详细评审表VO对象") +@ApiModel(value = "BidEvalDetailVO对象", description = "评标详细评审表VO对象") public class BidEvalDetailVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalEarlyJudgesSummaryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalEarlyJudgesSummaryVO.java similarity index 88% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalEarlyJudgesSummaryVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalEarlyJudgesSummaryVO.java index 67f9487..dcb4dd6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/BidEvalEarlyJudgesSummaryVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalEarlyJudgesSummaryVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -20,7 +20,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalEarlyJudgesSummaryVO对象", description="初审专家汇总VO对象") +@ApiModel(value = "BidEvalEarlyJudgesSummaryVO对象", description = "初审专家汇总VO对象") public class BidEvalEarlyJudgesSummaryVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfo.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfo.java index dfe774d..fdbb567 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfo.java @@ -1,11 +1,9 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfoDTO.java similarity index 83% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfoDTO.java index 50496ca..cf02e26 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/BidEvalInfoDTO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,7 +21,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="BidEvalInfoDTO对象", description="评标主表DTO") +@ApiModel(value = "BidEvalInfoDTO对象", description = "评标主表DTO") public class BidEvalInfoDTO extends BidEvalInfo implements Serializable { private static final Long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/JuryPrintVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/JuryPrintVO.java similarity index 93% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/JuryPrintVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/JuryPrintVO.java index f25fb0e..5d3583f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/JuryPrintVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/JuryPrintVO.java @@ -1,11 +1,10 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableField; import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; /** @@ -75,7 +74,7 @@ public class JuryPrintVO { */ @ApiModelProperty(value = "登录时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) private java.time.LocalDateTime loginTime; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/MemberVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/MemberVO.java similarity index 86% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/MemberVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/MemberVO.java index 5738b49..16894bf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/MemberVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/MemberVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -19,7 +19,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="MemberVO", description="专家成员VO") +@ApiModel(value = "MemberVO", description = "专家成员VO") public class MemberVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ResultDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ResultDetailVO.java similarity index 98% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ResultDetailVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ResultDetailVO.java index d7262d7..d92e4fa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/ResultDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ResultDetailVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategory.java similarity index 84% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategory.java index 2089c61..4cb0ef7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategory.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,8 +26,8 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) -@TableName(value = "biz_rsms_review_config_category",autoResultMap = true) -@ApiModel(value="ReviewConfigCategory对象", description="评审类别表") +@TableName(value = "biz_rsms_review_config_category", autoResultMap = true) +@ApiModel(value = "ReviewConfigCategory对象", description = "评审类别表") public class ReviewConfigCategory extends BaseEntity implements Serializable { private static final Long serialVersionUID = 1L; @@ -41,12 +41,15 @@ public class ReviewConfigCategory extends BaseEntity implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private String configId; - @ApiModelProperty(value = "类别名称") + @ApiModelProperty(value = "自定义类别名称") private String name; @ApiModelProperty(value = "类别:0:报价;1:商务;2:技术;5:服务。初审项类别:0:形式评审;1:资格审查项;2:响应性评审;7:符合性审查") private String category; + @ApiModelProperty(value = "类别名称") + private String categoryName; + @JsonInclude(value = JsonInclude.Include.NON_NULL) @ApiModelProperty(value = "权重") private BigDecimal weights; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategoryDTO.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategoryDTO.java index de308e9..947b60a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigCategoryDTO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetail.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetail.java index 632c577..ee0d074 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetail.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -27,8 +27,8 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName(value = "biz_rsms_review_config_detail",autoResultMap = true) -@ApiModel(value="ReviewConfigDetail对象", description="评分细则(初审和详审)") +@TableName(value = "biz_rsms_review_config_detail", autoResultMap = true) +@ApiModel(value = "ReviewConfigDetail对象", description = "评分细则(初审和详审)") public class ReviewConfigDetail extends BaseEntity implements Serializable { private static final Long serialVersionUID = 1L; @@ -123,5 +123,4 @@ public class ReviewConfigDetail extends BaseEntity implements Serializable { private BigDecimal lowScoreSecond; - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetailDTO.java similarity index 86% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetailDTO.java index 733bd8c..ad134ec 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigDetailDTO.java @@ -1,7 +1,5 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,6 +33,13 @@ public class ReviewConfigDetailDTO extends ReviewConfigDetail implements Seriali @ApiModelProperty(value = "类别") private String category; + /** + * excel导入时用来分组使用 + */ + @JsonInclude(value = JsonInclude.Include.NON_NULL) + @ApiModelProperty(value = "类别名称") + private String categoryName; + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) @ApiModelProperty(value = "评分标准集合") private List standardList; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigStandard.java similarity index 85% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigStandard.java index cd3e1ec..ddcb932 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/ReviewConfigStandard.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.bean; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -25,8 +25,8 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName(value = "biz_rsms_review_config_standard",autoResultMap = true) -@ApiModel(value="ReviewConfigStandard对象", description="评分标准") +@TableName(value = "biz_rsms_review_config_standard", autoResultMap = true) +@ApiModel(value = "ReviewConfigStandard对象", description = "评分标准") public class ReviewConfigStandard extends BaseEntity implements Serializable { private static final Long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterPriceScoreVO.java similarity index 92% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterPriceScoreVO.java index 4dfab43..22bfc11 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterPriceScoreVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterPriceScoreVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -20,7 +20,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="SupplierRegisterPriceScoreVO", description="供应商报价分VO") +@ApiModel(value = "SupplierRegisterPriceScoreVO", description = "供应商报价分VO") public class SupplierRegisterPriceScoreVO implements Serializable { private static final Long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterVO.java similarity index 89% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterVO.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterVO.java index 0a561b8..a9b4adc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/vo/SupplierRegisterVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/rsms/SupplierRegisterVO.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.extend.export.vo; +package com.chinaunicom.mall.ebtp.extend.feign.entity.rsms; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -21,7 +21,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="SupplierRegisterVO", description="供应商VO") +@ApiModel(value = "SupplierRegisterVO", description = "供应商VO") public class SupplierRegisterVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java index 9bf2f66..a35b2aa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java @@ -31,12 +31,11 @@ public class TemplateWarehouseController { * 通过模板类型查询模板数据 * * @param type - * * @return */ @ApiOperation("通过模板类型查询模板数据") @GetMapping("/{type}") - public BaseResponse getTemplateByType(@ApiParam(value = "模板类型", required = true) @PathVariable String type){ + public BaseResponse getTemplateByType(@ApiParam(value = "模板类型", required = true) @PathVariable String type) { BizBidTemplateWarehouse templateWarehouse = templateWarehouseService.getTemplateByType(type); return BaseResponse.success(templateWarehouse); } @@ -45,12 +44,11 @@ public class TemplateWarehouseController { * 新增模板仓库数据 * * @param templateWarehouse - * * @return */ @ApiOperation("新增模板仓库数据") @PostMapping("/insert") - public BaseResponse insertTemplate(@ApiParam(value = "模板仓库对象", required = true) @RequestBody BizBidTemplateWarehouse templateWarehouse){ + public BaseResponse insertTemplate(@ApiParam(value = "模板仓库对象", required = true) @RequestBody BizBidTemplateWarehouse templateWarehouse) { Boolean result = templateWarehouseService.insertTemplate(templateWarehouse); return BaseResponse.success(result); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidClientVersionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidClientVersionMapper.java index eb1bcc8..b1390eb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidClientVersionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidClientVersionMapper.java @@ -6,5 +6,5 @@ import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidClientVer public interface BizBidClientVersionMapper extends IBaseMapper { - + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidTemplateWarehouseMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidTemplateWarehouseMapper.java index 24443ab..8418019 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidTemplateWarehouseMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/BizBidTemplateWarehouseMapper.java @@ -6,5 +6,5 @@ import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateW public interface BizBidTemplateWarehouseMapper extends IBaseMapper { - + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml index af1178d..3195b5a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml @@ -7,7 +7,6 @@ - diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidTemplateWarehouseMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidTemplateWarehouseMapper.xml index 3ebd3e1..c08aaff 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidTemplateWarehouseMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidTemplateWarehouseMapper.xml @@ -4,17 +4,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java index 836e5cb..099ffb6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java @@ -3,7 +3,6 @@ package com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity; import com.baomidou.mybatisplus.annotation.FieldFill; 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.config.CustomLocalDateTimeTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,51 +25,44 @@ import java.time.LocalDateTime; @TableName(value = "biz_bid_client_version", autoResultMap = true) public class BizBidClientVersion implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ApiModelProperty(value = "主键") - private String id; + private static final long serialVersionUID = 1L; - /** - * 客户端对应文档中心-文档ID - */ - @ApiModelProperty(value = "客户端对应文档中心-文档ID") - private String documentCenterId; + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private String id; - /** - * 配置文件对应文档中心-文档ID - */ - @ApiModelProperty(value = "配置文件对应文档中心-文档ID") - private String configDocumentId; + /** + * 文档中心-文档ID + */ + @ApiModelProperty(value = "文档中心-文档ID") + private String documentCenterId; + /** + * ipass客户端版本号 + */ + @ApiModelProperty(value = "ipass客户端版本号") + private String ipassVersion; - /** - * ipass客户端版本号 - */ - @ApiModelProperty(value = "ipass客户端版本号") - private String ipassVersion; + @TableField( + fill = FieldFill.INSERT, + typeHandler = CustomLocalDateTimeTypeHandler.class + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @ApiModelProperty("客户端发布时间") + private LocalDateTime publishDate; - @TableField( - fill = FieldFill.INSERT, - typeHandler = CustomLocalDateTimeTypeHandler.class - ) - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @DateTimeFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @ApiModelProperty("客户端发布时间") - private LocalDateTime publishDate; - - /** - * ipass客户端版本号 - */ - @ApiModelProperty(value = "备注") - private String remark; + /** + * ipass客户端版本号 + */ + @ApiModelProperty(value = "备注") + private String remark; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidTemplateWarehouse.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidTemplateWarehouse.java index 564dbf4..592cbc3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidTemplateWarehouse.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidTemplateWarehouse.java @@ -20,33 +20,25 @@ import java.io.Serializable; @TableName(value = "biz_bid_template_warehouse", autoResultMap = true) public class BizBidTemplateWarehouse extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 模版仓库主键ID - */ - @ApiModelProperty(value = "模版仓库主键ID") - private String id; - - /** - * 文档中心-文档ID - */ - @ApiModelProperty(value = "文档中心-文档ID") - private String documentCenterId; - - /** - * 模板类型 - */ - @ApiModelProperty(value = "模板类型") - private String templateType; - - - - - + private static final long serialVersionUID = 1L; + /** + * 模版仓库主键ID + */ + @ApiModelProperty(value = "模版仓库主键ID") + private String id; + /** + * 文档中心-文档ID + */ + @ApiModelProperty(value = "文档中心-文档ID") + private String documentCenterId; + /** + * 模板类型 + */ + @ApiModelProperty(value = "模板类型") + private String templateType; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidClientVersionService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidClientVersionService.java index 8c09013..9ba8cc8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidClientVersionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidClientVersionService.java @@ -4,19 +4,18 @@ package com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidClientVersion; -import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; import java.io.IOException; /** * 对数据表 biz_bid_client_version 操作的 service - * @author Auto create * + * @author Auto create */ -public interface BizBidClientVersionService extends IBaseService{ +public interface BizBidClientVersionService extends IBaseService { /** * 通过版本号获得对应客户端文件id + * * @param version * @return */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidTemplateWarehouseService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidTemplateWarehouseService.java index 46db463..30ef6f2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidTemplateWarehouseService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/BizBidTemplateWarehouseService.java @@ -6,8 +6,8 @@ import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateW /** * 对数据表 biz_bid_template_warehouse 操作的 service - * @author Auto create * + * @author Auto create */ public interface BizBidTemplateWarehouseService extends IBaseService { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/BizBidClientVersionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/BizBidClientVersionServiceImpl.java index 74bc426..b453a34 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/BizBidClientVersionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/BizBidClientVersionServiceImpl.java @@ -1,17 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.impl; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.Map; -import java.util.Optional; - -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor.ModelConvertor; @@ -22,23 +11,31 @@ import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.dao.BizBidClientVersionMapper; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidClientVersion; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.BizBidClientVersionService; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.Map; +import java.util.Optional; /** * 对数据表 biz_bid_client_version 操作的 serviceImpl - * @author Auto create * + * @author Auto create */ @Service @RequiredArgsConstructor @Slf4j -public class BizBidClientVersionServiceImpl extends BaseServiceImpl implements BizBidClientVersionService { +public class BizBidClientVersionServiceImpl extends BaseServiceImpl implements BizBidClientVersionService { private final DocumentCenterService documentCenterService; - private final ModelConvertor modelConvertor; + private final ModelConvertor modelConvertor; @Resource private HttpServletResponse response; @@ -53,9 +50,9 @@ public class BizBidClientVersionServiceImpl extends BaseServiceImpl implements BizBidTemplateWarehouseService { +public class BizBidTemplateWarehouseServiceImpl extends BaseServiceImpl implements BizBidTemplateWarehouseService { @Override @@ -26,7 +27,7 @@ public class BizBidTemplateWarehouseServiceImpl extends BaseServiceImpl signTimeStamp(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { + public BaseResponse signTimeStamp(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data", required = false) String data) { //TimeServiceConstant constant = new TimeServiceConstant(); return BaseResponse.success(timeServiceConstant.signTimeStamp(data)); } /** * 解析时间戳 + * * @param timestamp 时间戳加密原文 * @return 时间戳对象 */ @@ -51,52 +52,60 @@ public class TimeServiceController { /** * 获取时间戳 + * * @param data 待申请时间戳的原文 * @return 时间戳对象 */ @ApiOperation("直接获取时间戳对象(内涵日期)") - @GetMapping(value = "/getServiceTimeObj") - public BaseResponse getServiceTimeObj(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { + @PostMapping(value = "/getServiceTimeObj") + public BaseResponse getServiceTimeObj(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data", required = false) String data) { //TimeServiceConstant constant = new TimeServiceConstant(); return BaseResponse.success(timeServiceConstant.getServiceTimeObj(data)); } + /** * 直接获取获取时间戳 + * * @param data 待申请时间戳的原文 * @return 时间戳对象 */ @ApiOperation("直接获取日期字符串") @GetMapping(value = "/getServiceTime") - public BaseResponse getServiceTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { + public BaseResponse getServiceTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data", required = false) String data) { //TimeServiceConstant constant = new TimeServiceConstant(); return BaseResponse.success(timeServiceConstant.getServiceTime(data)); } + /** * 获取年月日时分秒分割存储对象 + * * @param data 待申请时间戳的原文 * @return SystemTime */ @ApiOperation("获取日期对象SystemTime") @GetMapping(value = "/getServiceSystemTime") - public BaseResponse getServiceSystemTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { + public BaseResponse getServiceSystemTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data", required = false) String data) { //TimeServiceConstant constant = new TimeServiceConstant(); return BaseResponse.success(timeServiceConstant.getServiceSystemTime(data)); } + /** * 获取开标剩余时间倒数 + * * @return */ @ApiOperation("获取开标剩余时间倒数") @GetMapping("/getDescOpenRoomTime") @PreAuthorize("hasAnyAuthority('ebtp-agency-project-manager','ebtp-purchase','ebtp-supplier')") - public BaseResponse getDescOpenRoomTime(@RequestParam(name = "openTime",required = true) String openTime){ + public BaseResponse getDescOpenRoomTime(@RequestParam(name = "openTime", required = true) String openTime) { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //TimeServiceConstant constant = new TimeServiceConstant(); - Date now = timeServiceConstant.getServiceDate("getDescOpenRoomTime");;//当前时间 + Date now = timeServiceConstant.getServiceDate("getDescOpenRoomTime"); + ;//当前时间 Date date = df.parse(openTime);//过去 - long l = date.getTime()-now.getTime(); + long l = date.getTime() - now.getTime(); long day = l / (24 * 60 * 60 * 1000); long hour = (l / (60 * 60 * 1000) - day * 24); long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60); @@ -105,8 +114,8 @@ public class TimeServiceController { SystemTime systemTime = new SystemTime() .setDate((int) day) .setHour((int) hour) - .setMinute((int)min) - .setSecond((int)s); + .setMinute((int) min) + .setSecond((int) s); return BaseResponse.success(systemTime); } catch (ParseException e) { e.printStackTrace(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/SystemTime.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/SystemTime.java index 1683127..cefeb24 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/SystemTime.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/SystemTime.java @@ -11,40 +11,39 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) public class SystemTime { - /** - * 时间 - */ - private String timestamp; - /** - * 年 - */ - private Integer year; + /** + * 时间 + */ + private String timestamp; + /** + * 年 + */ + private Integer year; - /** - * 月 - */ - private Integer month; + /** + * 月 + */ + private Integer month; - /** - * 日 - */ - private Integer date; + /** + * 日 + */ + private Integer date; - /** - * 时 - */ - private Integer hour; + /** + * 时 + */ + private Integer hour; - /** - * 分 - */ - private Integer minute; - - /** - * 秒 - */ - private Integer second; + /** + * 分 + */ + private Integer minute; + /** + * 秒 + */ + private Integer second; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/TtsAgent.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/TtsAgent.java index b4b6e1c..7c3f74a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/TtsAgent.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/tsa/TtsAgent.java @@ -1,107 +1,90 @@ package com.chinaunicom.mall.ebtp.extend.timeService.tsa; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - /** * CA 时间戳服务接口 - * + * * @工程: EPS(4.0) - * * @模块: - * * @作者: 李志慧 - * * @创建日期: 2016年3月17日 - * * @修改记录(修改时间、作者、原因): */ public interface TtsAgent { - /** - * 创建hash 的时间戳 - * - * @作者: 李志慧 @创建日期: 2016年3月17日 - * - * @参数: hash 数据hash值 - * @返回值: String - * - * @修改记录(修改时间、作者、原因): - */ - String createTimestamp(String hash); + /** + * 创建hash 的时间戳 + * + * @作者: 李志慧 @创建日期: 2016年3月17日 + * @参数: hash 数据hash值 + * @返回值: String + * @修改记录(修改时间、作者、原因): + */ + String createTimestamp(String hash); - /** - * 时间戳验证 - * - * @作者: 李志慧 @创建日期: 2016年3月17日 - * - * @参数: timestamp 时间戳 - * @返回值: boolean - * - * @修改记录(修改时间、作者、原因): - */ - boolean verifyTimestamp(String timestamp); + /** + * 时间戳验证 + * + * @作者: 李志慧 @创建日期: 2016年3月17日 + * @参数: timestamp 时间戳 + * @返回值: boolean + * @修改记录(修改时间、作者、原因): + */ + boolean verifyTimestamp(String timestamp); - /** - * 解析时间戳 - * - * @作者: 李志慧 @创建日期: 2016年3月17日 - * - * @参数: timestamp 时间戳 - * @返回值: TtsParseResult - * - * @修改记录(修改时间、作者、原因): - */ - TtsParseResult parseTimestamp(String timestamp); + /** + * 解析时间戳 + * + * @作者: 李志慧 @创建日期: 2016年3月17日 + * @参数: timestamp 时间戳 + * @返回值: TtsParseResult + * @修改记录(修改时间、作者、原因): + */ + TtsParseResult parseTimestamp(String timestamp); - /** - * 时间戳解析结果 - * - * @作者: 李志慧 - * - */ - public class TtsParseResult { - // 时间 - private String timestamp; + /** + * 时间戳解析结果 + * + * @作者: 李志慧 + */ + public class TtsParseResult { + // 时间 + private String timestamp; - // hash 值 - private String hash; + // hash 值 + private String hash; - // 签名证书 - private String cert; + // 签名证书 + private String cert; - public TtsParseResult(String timestamp, String hash, String cert){ - super(); - this.timestamp = timestamp; - this.hash = hash; - this.cert = cert; - } + public TtsParseResult(String timestamp, String hash, String cert) { + super(); + this.timestamp = timestamp; + this.hash = hash; + this.cert = cert; + } - public String getTimestamp() { - return timestamp; - } + public String getTimestamp() { + return timestamp; + } - public void setTimestamp(String timestamp) { - this.timestamp = timestamp; - } + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; + } - public String getHash() { - return hash; - } + public String getHash() { + return hash; + } - public void setHash(String hash) { - this.hash = hash; - } + public void setHash(String hash) { + this.hash = hash; + } - public String getCert() { - return cert; - } + public String getCert() { + return cert; + } - public void setCert(String cert) { - this.cert = cert; - } - } + public void setCert(String cert) { + this.cert = cert; + } + } } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ca20abb..6d6acc0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -171,7 +171,7 @@ mconfig: rsms: biz-service-ebtp-rsms #评审结构化服务 tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 - + usercenter: core-service-usercenter-public #用户中心 document: clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 63a3334..4e95ae0 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -163,6 +163,7 @@ mconfig: rsms: biz-service-ebtp-rsms #评审结构化服务 tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 + usercenter: core-service-usercenter-public #用户中心 document: diff --git a/src/main/resources/application-mster.yml b/src/main/resources/application-mster.yml index 885f90f..9ea52e4 100644 --- a/src/main/resources/application-mster.yml +++ b/src/main/resources/application-mster.yml @@ -166,7 +166,7 @@ mconfig: rsms: biz-service-ebtp-rsms #评审结构化服务 tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 - + usercenter: core-service-usercenter-public #用户中心 document: clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 5249254..9df047a 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -166,7 +166,7 @@ mconfig: rsms: biz-service-ebtp-rsms #评审结构化服务 tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 - + usercenter: core-service-usercenter-public #用户中心 document: clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 diff --git a/src/main/resources/model/开标记录表.docx b/src/main/resources/model/开标记录表.docx index 809e86d..28cfcd7 100644 Binary files a/src/main/resources/model/开标记录表.docx and b/src/main/resources/model/开标记录表.docx differ diff --git a/src/main/resources/model/评标报告.docx b/src/main/resources/model/评标报告.docx index 944df38..4013c2b 100644 Binary files a/src/main/resources/model/评标报告.docx and b/src/main/resources/model/评标报告.docx differ