diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java new file mode 100644 index 000000000..b13c01964 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java @@ -0,0 +1,93 @@ +package com.jero.modules.cert.collect.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService; +import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + + +/** + * @Description: 参数项收集清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="历史参数项收集清单") +@RestController +@RequestMapping("/params/collectManifestHistory") +@Slf4j +public class ParamsCollectManifestHistoryEOController extends JeroController { + @Autowired + private IParamsCollectManifestHistoryEOService paramsCollectManifestHistoryEOService; + + @Autowired + private IParamsConfigHistoryEOService paramsConfigHistoryEOService; + + /** + * 表头中英文切换 + * + * @return + */ + @AutoLog(value = "历史参数项收集清单-表头中英文切换") + @ApiOperation(value="历史参数项收集清单-表头中英文切换", notes="历史参数项收集清单-表头中英文切换") + @GetMapping(value = "/getHeader") + public Result>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, + @RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = paramsCollectManifestHistoryEOService.getHeader(paramsManifestId, flag, cut); + return Result.OK(list); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "历史参数项收集清单-列表查询") + @ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询") + @GetMapping(value = "/list") + public Result>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, + @RequestParam(name = "cut") String cut) { + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { + paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); + } + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) { + paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%")); + } + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) { + paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%")); + } + + List> list = paramsCollectManifestHistoryEOService.queryList(paramsCollectManifestEO, cut); + return Result.OK(list); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "历史参数配置-查看单个详情") + @ApiOperation(value="历史参数配置-查看单个详情", notes="历史参数配置-查看单个详情") + @GetMapping(value = "/getConfigById") + public Result getConfigById(@RequestParam(name = "id") String configId) { + ParamsConfigHistoryEO paramsConfigHistoryEO = paramsConfigHistoryEOService.getById(configId); + return Result.OK(paramsConfigHistoryEO); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index cd8ff578e..f458a8cef 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -9,6 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.collect.entity.ParamsManifestEO; import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -158,10 +159,47 @@ public class ParamsManifestEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(","))); + paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } + /** + * 变更扩展 + * + * @param id + * @return + */ + @AutoLog(value = "参数清单-变更扩展") + @ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展") + @GetMapping(value = "/changeExtension") + public Result changeExtension(@RequestParam(name="id",required=true) String id) { + boolean isSuccess = paramsManifestEOService.changeExtension(id); + if(isSuccess) { + return Result.OK("变更扩展成功！"); + } else { + return Result.error("变更扩展失败！"); + } + } + + /** + * 历史版本 + * 根据标题查询 + * @param title + * @return + */ + @AutoLog(value = "参数清单-历史版本") + @ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本") + @GetMapping(value = "/history") + public Result history(@RequestParam(name="title",required=true) String title) { + List historyVersionList = paramsManifestEOService.getHistoryVersionList(title); + return Result.OK(historyVersionList); + } + + + + + + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java new file mode 100644 index 000000000..f2916a620 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java @@ -0,0 +1,25 @@ +package com.jero.modules.cert.collect.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * @Description: 参数项收集清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Data +@TableName("params_collect_manifest_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_collect_manifest_history对象", description="参数项收集清单历史版本") +public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestEO implements Serializable { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java new file mode 100644 index 000000000..8d67b51c4 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataHistoryEO.java @@ -0,0 +1,26 @@ +package com.jero.modules.cert.collect.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * @Description: 参数配置数据历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Data +@TableName("params_config_data_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_config_data_history对象", description="参数配置数据历史版本") +public class ParamsConfigDataHistoryEO extends ParamsConfigDataEO implements Serializable { + private static final long serialVersionUID = 1L; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java new file mode 100644 index 000000000..a51fdd657 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigHistoryEO.java @@ -0,0 +1,26 @@ +package com.jero.modules.cert.collect.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * @Description: 参数配置历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Data +@TableName("params_config_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_config_history对象", description="参数配置历史版本") +public class ParamsConfigHistoryEO extends ParamsConfigEO implements Serializable { + private static final long serialVersionUID = 1L; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java new file mode 100644 index 000000000..f32edfa62 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java @@ -0,0 +1,26 @@ +package com.jero.modules.cert.collect.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * @Description: 参数清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Data +@TableName("params_manifest_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_manifest_history对象", description="参数清单历史版本") +public class ParamsManifestHistoryEO extends ParamsManifestEO implements Serializable { + private static final long serialVersionUID = 1L; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java new file mode 100644 index 000000000..6478f1525 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java @@ -0,0 +1,19 @@ +package com.jero.modules.cert.collect.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 参数项收集清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface ParamsCollectManifestHistoryEOMapper extends BaseMapper { + + List listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java new file mode 100644 index 000000000..94d038e5c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataHistoryEOMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.cert.collect.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; + +/** + * @Description: 参数配置数据历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface ParamsConfigDataHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java new file mode 100644 index 000000000..67adecaee --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigHistoryEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数配置历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface ParamsConfigHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java new file mode 100644 index 000000000..9a9777ff2 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.cert.collect.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO; + +/** + * @Description: 参数清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface ParamsManifestHistoryEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml new file mode 100644 index 000000000..dadc1b2cd --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + + AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + + AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + + AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%') + + + AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%') + + + + + AND sdt = #{paramsCollectManifestEO.sdt} + + + AND dre = #{paramsCollectManifestEO.dre} + + + AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml new file mode 100644 index 000000000..738deab5a --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataHistoryEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml new file mode 100644 index 000000000..876924247 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml new file mode 100644 index 000000000..803567144 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 14542044d..65bd0e55e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -91,4 +91,6 @@ public interface IParamsCollectManifestEOService extends IService querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO); + + Map isCollectFinished(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java new file mode 100644 index 000000000..96c28fd2a --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java @@ -0,0 +1,35 @@ +package com.jero.modules.cert.collect.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 参数项收集清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface IParamsCollectManifestHistoryEOService extends IService { + + /** + * 列表查询 + * @param paramsCollectManifestEO + * @param cut + * @return + */ + List> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut); + + /** + * 列表表头中英文切换 + * @param paramsManifestId + * @param flag + * @param cut + * @return + */ + List> getHeader(String paramsManifestId, String flag, String cut); + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java new file mode 100644 index 000000000..84ff430f9 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java @@ -0,0 +1,22 @@ +package com.jero.modules.cert.collect.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; + +/** + * @Description: 参数配置数据历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface IParamsConfigDataHistoryEOService extends IService { + + /** + * 通过id查询 + * + * @param paramsConfigId + * @param paramsCollectManifestId + * @return + */ + ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java new file mode 100644 index 000000000..35aed59c1 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigHistoryEOService.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; + +import java.util.List; + +/** + * @Description: 参数配置历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface IParamsConfigHistoryEOService extends IService { + + List queryList(String paramsManifestId); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index 394f31a0a..4874820f1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import java.util.List; @@ -69,4 +70,8 @@ public interface IParamsManifestEOService extends IService { List getNewestPublishList(ParamsTemplateEO paramsTemplateEO); IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO); + + boolean changeExtension(String id); + + List getHistoryVersionList(String title); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java new file mode 100644 index 000000000..3dd20e90b --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java @@ -0,0 +1,20 @@ +package com.jero.modules.cert.collect.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO; +import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; + +import java.util.List; + +/** + * @Description: 参数清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface IParamsManifestHistoryEOService extends IService { + + void addForChangeExtension(String paramsManifestId); + + List getHistoryVersionList(String title); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index af0e6a08d..6b740cca9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -93,6 +93,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsInfoPublishEOList = paramsCollectManifestVO.getParamsInfoPublishEOList(); + + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 复制参数项 List paramsCollectManifestEOList = new ArrayList<>(); for (ParamsInfoPublishEO source : paramsInfoPublishEOList) { @@ -102,6 +105,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl isCollectFinished(String paramsManifestId) { + Map map = new HashMap<>(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId) + .orderByDesc(ParamsCollectManifestEO::getUpdateTime); // 按修改时间降序 + List list = list(queryWrapper); + int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count(); + if (collectFinishNumber == list.size()) { + map.put("finish", true); + map.put("time", list.get(0).getUpdateTime()); + + } else { + map.put("finish", false); + } + return map; + } + /** * 实体对象转成Map * @param obj 实体对象 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java new file mode 100644 index 000000000..d97d4d1ef --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -0,0 +1,417 @@ +package com.jero.modules.cert.collect.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.cert.collect.entity.*; +import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; +import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; +import com.jero.modules.cert.collect.mapper.ParamsCollectManifestHistoryEOMapper; +import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService; +import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; +import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; +import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; +import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.ISysDictItemService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Field; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description: 参数项收集清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Service +public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl implements IParamsCollectManifestHistoryEOService { + + @Autowired + private ParamsCollectManifestHistoryEOMapper paramsCollectManifestHistoryEOMapper; + + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + + @Autowired + private IParamsConfigHistoryEOService paramsConfigHistoryEOService; + + @Autowired + private IParamsConfigDataHistoryEOService paramsConfigDataHistoryEOService; + + @Autowired + private ISysDictItemService sysDictItemService; + + + /** + * 列表查询 + * + * @return + */ + @Override + public List> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) { + String paramsManifestId = paramsCollectManifestEO.getParamsManifestId(); + +// String userTypes = paramsCollectManifestEO.getUserTypes(); +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户 +// if ("sdt".equals(userTypes)) { +// paramsCollectManifestEO.setSdt(loginUser.getUsername()); +// } else if ("dre".equals(userTypes)) { +// paramsCollectManifestEO.setDre(loginUser.getUsername()); +// } else if ("sdt,dre".equals(userTypes)) { +// paramsCollectManifestEO.setSdt(loginUser.getUsername()); +// paramsCollectManifestEO.setDre(loginUser.getUsername()); +// } + List list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限 + List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列 + + // 普通数据字典 + List dictItemList = new ArrayList<>(); + List dictCodeList = new ArrayList<>(); + dictCodeList.add("duty_territory"); + dictCodeList.add("cert_category"); + for (String dictCode : dictCodeList) { + List dictItems = sysDictItemService.selectItemsByDictCode(dictCode); + dictItemList.addAll(dictItems); + } + + List> listMap = new ArrayList<>(); + list.forEach(collectManifestEO -> { // 参数收集清单 + // 处理数据字典字段 中英文切换 认证类型，责任领域 + List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(",")); + List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); + String certCategoryName = ""; + String dutyTerritoryName = ""; + if (CutEnum.CN.getValue().equals(cut)) { + certCategoryName = dictItemList.stream() + .filter(e -> certCategory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + + dutyTerritoryName = dictItemList.stream() + .filter(e -> dutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + + } else if (CutEnum.EN.getValue().equals(cut)) { + certCategoryName = dictItemList.stream() + .filter(e -> certCategory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + + dutyTerritoryName = dictItemList.stream() + .filter(e -> dutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + + } + + +// String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut); + collectManifestEO.setCertCategory(certCategoryName); +// String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut); + collectManifestEO.setDutyTerritory(dutyTerritoryName); + + // 处理状态字段 + Map collectManifestStateMap = CollectManifestStateEnum.toMap(cut); + String stateName = collectManifestStateMap.get(collectManifestEO.getState()); + collectManifestEO.setState(stateName); + + Map manifestMap = objectToMap(collectManifestEO); // 对象转map + String controlType = collectManifestEO.getControlType(); + String paramsCollectManifestId = collectManifestEO.getId(); + + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + Map configMap = new HashMap<>(); + String paramsConfigId = paramsConfigEO.getId(); + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + configMap.put("controlType", controlType); + configMap.put("list", paramsConfigDataVOList); + manifestMap.put(paramsConfigEO.getId(), configMap); + }); + } + + listMap.add(manifestMap); + }); + + return listMap; + } + + /** + * 重新组装配置数据 用于返回前端 + * @param controlType + * @param paramsConfigDataEO + * @param paramsCollectManifestEO + * @return + */ + private List getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) { + List paramsConfigDataVOList = new ArrayList<>(); + + if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO(); + pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullMoreConfigDataVO); + + } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO(); + pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullMoreConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues())); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } + return paramsConfigDataVOList; + } + + private List> getControlValueMapList(String controlValue) { + List> controlValueMapList = new ArrayList<>(); + if (StringUtils.isNotEmpty(controlValue)) { + controlValue = controlValue.replace("，", ","); + String[] controlValueStr = controlValue.split(","); + for (int i = 0; i < controlValueStr.length; i++) { + Map controlValueMap = new HashMap<>(); + controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("value", controlValueStr[i]); + controlValueMapList.add(controlValueMap); + } + } + return controlValueMapList; + } + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String paramsManifestId, String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7 + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); + List> listConfig = new LinkedList<>(); + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { + Map map = new HashMap<>(); + map.put("db_field_name", paramsConfigEO.getId()); + map.put("db_field_txt", paramsConfigEO.getConfigName()); + map.put("type", true); //配置列 标识 + listConfig.add(map); + } + + List> list = new LinkedList<>(); + int indexOfDescription = 1; // 参数说明的位置 + for (int i = 0; i < fieldList.size(); i++) { + OnlCgformField onlCgformField = fieldList.get(i); + Map map = new HashMap<>(); + String dbFieldName = onlCgformField.getDbFieldName(); + if ("description".equals(dbFieldName)) { + indexOfDescription = i; + } + if ("sdt".equals(dbFieldName)) { + map.put("click", true); + } + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + + list.addAll(indexOfDescription+1, listConfig); + return list; + } + + /** + * 实体对象转成Map + * @param obj 实体对象 + * @return + */ + private Map objectToMap(Object obj) { + Map map = new HashMap<>(); + if (obj == null) { + return map; + } + Class clazz = obj.getClass(); + Field[] fields = clazz.getDeclaredFields(); + try { + for (Field field : fields) { + field.setAccessible(true); + map.put(field.getName(), field.get(obj)); + } + } catch (Exception e) { + e.printStackTrace(); + } + return map; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java new file mode 100644 index 000000000..0a58d103f --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -0,0 +1,34 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; +import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper; +import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; +import org.springframework.stereotype.Service; + +/** + * @Description: 参数配置数据历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Service +public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl implements IParamsConfigDataHistoryEOService { + + /** + * 通过id查询 + * + * @param paramsConfigId + * @param paramsCollectManifestId + * @return + */ + @Override + public ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigDataHistoryEO::getParamsConfigId, paramsConfigId); + queryWrapper.eq(ParamsConfigDataHistoryEO::getParamsCollectManifestId, paramsCollectManifestId); + getOne(queryWrapper); + return getOne(queryWrapper); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java new file mode 100644 index 000000000..1f5f81b71 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigHistoryEOServiceImpl.java @@ -0,0 +1,34 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; +import com.jero.modules.cert.collect.mapper.ParamsConfigHistoryEOMapper; +import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 参数配置历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Service +public class ParamsConfigHistoryEOServiceImpl extends ServiceImpl implements IParamsConfigHistoryEOService { + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(String paramsManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigHistoryEO::getParamsManifestId, paramsManifestId); + queryWrapper.orderByAsc(ParamsConfigHistoryEO::getDisplaySeq); + List list = list(queryWrapper); + return list; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index b8dce6bc1..a9775d1e7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -14,6 +14,8 @@ import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService; +import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; @@ -29,10 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -107,7 +106,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = rows.getRecords(); + paramsManifestEOList.forEach(manifestEO -> { + Map map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId()); + Boolean finish = (Boolean) map.get("finish"); + Date time = (Date) map.get("time"); + if (finish) { + manifestEO.setState(ManifestStateEnum.FINISHED.getValue()); + manifestEO.setFinishTime(time); + + // 更新清单状态和完成时间 + ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); + updateParamsManifestEO.setId(manifestEO.getId()); + updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue()); + updateParamsManifestEO.setFinishTime(time); + updateById(updateParamsManifestEO); + } + }); + + return rows; + } + + @Autowired + private IParamsManifestHistoryEOService paramsManifestHistoryEOService; + + /** + * 变更扩展 + * 仅能选择一条进行变更扩展 + * 状态为已完成的清单可进行变更扩展 + * @param id + * @return + */ + @Override + public boolean changeExtension(String id) { + // 变更扩展时，将历史清单数据 连同历史参数项收集数据 备份到相关历史表中 + paramsManifestHistoryEOService.addForChangeExtension(id); + + // TODO 将模板最新版本和项目中参数项进行比对 + return false; + } + + @Override + public List getHistoryVersionList(String title) { + return paramsManifestHistoryEOService.getHistoryVersionList(title); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java new file mode 100644 index 000000000..57552b4d1 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java @@ -0,0 +1,155 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.entity.*; +import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; +import com.jero.modules.cert.collect.mapper.ParamsManifestHistoryEOMapper; +import com.jero.modules.cert.collect.service.*; +import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description: 参数清单历史版本 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Service +public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl implements IParamsManifestHistoryEOService { + + @Autowired + private IParamsManifestEOService paramsManifestEOService; + + @Autowired + private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper; + + @Autowired + private IParamsConfigEOService paramsConfigEOService; + + @Autowired + private IParamsConfigDataEOService paramsConfigDataEOService; + + @Autowired + private IParamsCollectManifestHistoryEOService paramsCollectManifestHistoryEOService; + + @Autowired + private IParamsConfigDataHistoryEOService paramsConfigDataHistoryEOService; + + @Autowired + private IParamsConfigHistoryEOService paramsConfigHistoryEOService; + + @Autowired + private IParamsManifestHistoryEOService paramsManifestHistoryEOService; + + + /** + * 变更扩展时，将历史清单数据 连同历史参数项收集数据 备份到相关历史表中 + * + * @param paramsManifestId + */ + @Override + public void addForChangeExtension(String paramsManifestId) { + + // 备份参数清单 + ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); + ParamsManifestHistoryEO paramsManifestHistoryEO = new ParamsManifestHistoryEO(); + BeanUtils.copyProperties(paramsManifestEO, paramsManifestHistoryEO); + String paramsManifestHistoryId = UUID.randomUUID().toString().replace("-",""); + paramsManifestHistoryEO.setId(paramsManifestHistoryId); + + // 查询清单下配置 + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); + // 备份清单的配置 + List paramsConfigHistoryEOList = new ArrayList<>(); + Map configIdMap = new HashMap<>(); + paramsConfigEOList.forEach(sourceConfigEO -> { + ParamsConfigHistoryEO targetConfigEO = new ParamsConfigHistoryEO(); + BeanUtils.copyProperties(sourceConfigEO, targetConfigEO); + String targetConfigId = UUID.randomUUID().toString().replace("-",""); + targetConfigEO.setId(targetConfigId); + targetConfigEO.setParamsManifestId(paramsManifestHistoryId); + + configIdMap.put(sourceConfigEO.getId(), targetConfigId); + paramsConfigHistoryEOList.add(targetConfigEO); + }); + + // 查询所有配置数据 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, paramsConfigIdList); + List paramsConfigDataEOList = paramsConfigDataEOService.list(queryWrapper); + + // 备份清单参数项 + ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO(); + paramsCollectManifestEO.setParamsManifestId(paramsManifestId); + List paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); + List paramsCollectManifestHistoryEOList = new ArrayList<>(); + List paramsConfigDataHistoryEOList = new ArrayList<>(); + + paramsCollectManifestEOList.forEach(source -> { + ParamsCollectManifestHistoryEO target = new ParamsCollectManifestHistoryEO(); + BeanUtils.copyProperties(source,target); + String paramsCollectManifestHistoryId = UUID.randomUUID().toString().replace("-",""); + target.setId(paramsCollectManifestHistoryId); + target.setParamsManifestId(paramsManifestHistoryId); + paramsCollectManifestHistoryEOList.add(target); + + // 备份参数项的配置数据 + List sourceConfigDataEOList = paramsConfigDataEOList.stream() + .filter(e->e.getParamsCollectManifestId().equals(source.getId())) + .collect(Collectors.toList()); + + sourceConfigDataEOList.forEach(sourceConfigDataEO -> { + ParamsConfigDataHistoryEO targetConfigDataHistoryEO = new ParamsConfigDataHistoryEO(); + BeanUtils.copyProperties(sourceConfigDataEO, targetConfigDataHistoryEO); + targetConfigDataHistoryEO.setId(UUID.randomUUID().toString().replace("-","")); + targetConfigDataHistoryEO.setParamsCollectManifestId(paramsCollectManifestHistoryId); + targetConfigDataHistoryEO.setParamsConfigId(configIdMap.get(sourceConfigDataEO.getParamsConfigId())); + paramsConfigDataHistoryEOList.add(targetConfigDataHistoryEO); + }); + }); + + // 批量添加参数项 + paramsCollectManifestHistoryEOService.saveBatch(paramsCollectManifestHistoryEOList); + + // 批量添加配置 + paramsConfigHistoryEOService.saveBatch(paramsConfigHistoryEOList); + + // 批量添加配置数据 + paramsConfigDataHistoryEOService.saveBatch(paramsConfigDataHistoryEOList); + + // 添加清单 + paramsManifestHistoryEOService.save(paramsManifestHistoryEO); + + // 参数清单版加 1 + ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); + updateParamsManifestEO.setId(paramsManifestEO.getId()); + updateParamsManifestEO.setVersion(paramsManifestEO.getVersion() + 1); + paramsManifestEOService.updateById(updateParamsManifestEO); + } + + @Override + public List getHistoryVersionList(String title) { + // 同一项目下标题时唯一的，历史版本和当前版本通过标题进行关联 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestHistoryEO::getTitle, title) + .orderByAsc(ParamsManifestHistoryEO::getVersion); + List list = list(queryWrapper); + List historyVersionList = new ArrayList<>(); + list.forEach(paramsManifestHistoryEO -> { + ParamsManifestHistoryVO paramsManifestHistoryVO = new ParamsManifestHistoryVO(); + paramsManifestHistoryVO.setId(paramsManifestHistoryEO.getId()); + paramsManifestHistoryVO.setVersion(paramsManifestHistoryEO.getVersion()); + historyVersionList.add(paramsManifestHistoryVO); + }); + + return historyVersionList; + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java new file mode 100644 index 000000000..b809752f2 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestHistoryVO.java @@ -0,0 +1,15 @@ +package com.jero.modules.cert.collect.vo; + +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 16:47 2022/5/12 + */ +@Data +public class ParamsManifestHistoryVO { + private String id; + private Integer version; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java index 576700be8..de8f6c810 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.cert.template.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.template.entity.*; import com.jero.modules.cert.template.mapper.ParamsInfoPublishEOMapper; @@ -118,6 +120,9 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); + if (CollectionUtil.isEmpty(sourceParamsInfoEOList)) { + throw new JeroBootException("没有可发布的参数项！"); // 模板中没有参数项，不让发布 + } List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); List targetParamsInfoPublishEOList = new ArrayList<>();