diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 07199fc0..dd34b76a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -12,6 +12,7 @@ public class ResultCommon { public static final String OK = "message.ok"; // 操作成功 public static final String ERROR = "message.error"; // 操作失败 + public static final String EMPTY_SOURCE = "message.empty.source"; // 操作失败 public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java new file mode 100644 index 00000000..f356646b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java @@ -0,0 +1,41 @@ +package com.jero.modules.laws.common.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.standard.entity.LawsNodeRelation; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 javax.servlet.http.HttpServletRequest; + +/** + * @Author: liao + * @Date: 2023/9/11 15:40 + * @Description: 法规通用操作 + */ +@Api(tags="法规通用操作") +@RestController +@RequestMapping("/laws/standard/common") +public class LawsCommonController { + + @Autowired + private ILawsCommonService lawsCommonService; + + @ApiOperation(value="多选标准弹框", notes="多选标准弹框") + @GetMapping(value = "/getManyStandardSelectionBox") + public Result> getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java index 6d84214a..cadd3a91 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java @@ -1,8 +1,12 @@ package com.jero.modules.laws.common.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.tag.entity.LawsTag; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -68,4 +72,7 @@ public interface LawsCommonMapper { int commonEdit(@org.apache.ibatis.annotations.Param("tableName") String tableName, @org.apache.ibatis.annotations.Param("updateSql") String updateSql, @org.apache.ibatis.annotations.Param("id") String id); + + IPage getManyStandardSelectionBox(Page page, + @Param("vo") ManyStandardSelectionBoxVO selectionBoxVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index e6398cf2..91afcf44 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -34,4 +34,15 @@ WHERE id = #{id} + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 4ced9552..6e7b38a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -1,6 +1,8 @@ package com.jero.modules.laws.common.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.tag.entity.LawsTag; import java.util.List; @@ -76,4 +78,10 @@ public interface ILawsCommonService { **/ String getSystemTree(String module); + /** + * @Author: liao + * @Date: 2023/9/11 16:07 + * @Description: 多选标准弹框 + **/ + IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 89518dd9..5ebb195a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -12,6 +12,9 @@ import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.personal.entity.LawsStandardCollection; @@ -407,6 +410,22 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return null; } + /** + * @Author: liao + * @Date: 2023/9/11 16:41 + * @Description: 多选标准弹框 + **/ + @Override + public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + // 来源不能为空 + if (StringUtils.isBlank(selectionBoxVO.getSource())) { + throw new JeroBootException(ResultCommon.EMPTY_SOURCE, ""); + } + selectionBoxVO.setSource(TableNameEnum.getTableName(selectionBoxVO.getSource())); + return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO); + } + /** * @Author: liao * @Date: 2023/8/24 9:53 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java new file mode 100644 index 00000000..007f6e03 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java @@ -0,0 +1,33 @@ +package com.jero.modules.laws.common.vo; + +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; + +/** + * @Author: liao + * @Date: 2023/9/11 15:52 + * @Description: 多选标准弹框 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="多选标准弹框", description="多选标准弹框") +public class ManyStandardSelectionBox { + @ApiModelProperty(value = "主键ID") + private java.lang.String id; + @ApiModelProperty(value = "标准编号") + private java.lang.String standardNumber; + @ApiModelProperty(value = "标准名称") + private java.lang.String standardName; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date releaseDate; + @ApiModelProperty(value = "标准状态") + private java.lang.String standardState; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java new file mode 100644 index 00000000..cfdffb58 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java @@ -0,0 +1,23 @@ +package com.jero.modules.laws.common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author: liao + * @Date: 2023/9/11 16:02 + * @Description: 多选标准弹框查询 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="多选标准弹框查询", description="多选标准弹框查询") +public class ManyStandardSelectionBoxVO { + @ApiModelProperty(value = "来源（1国内标准、2海外标准、3企业标准）") + private java.lang.String source; + @ApiModelProperty(value = "标准号/标准名称") + private java.lang.String standardNumberOrName; +} diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index c746a736..a5a37d73 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -7,4 +7,5 @@ tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u56FA\u5B9A\u5B57\u6 tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5 message.ok=\u64CD\u4F5C\u6210\u529F message.error=\u64CD\u4F5C\u5931\u8D25 +message.empty.source=The source cannot be empty es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index fae94b42..f7fcedb6 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -7,4 +7,5 @@ tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=Fixed field, cannot b tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=Attribute already exists, please check! message.ok=Successful operation message.error=Operation failure +message.empty.source=The source cannot be empty es.rmr.setQuality.overTen=Please select up to 10 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index c746a736..9cc20db8 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -5,6 +5,7 @@ tag.delete.\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u5305\ tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539 tag.edit.\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664 tag.edit.\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5 -message.ok=\u64CD\u4F5C\u6210\u529F -message.error=\u64CD\u4F5C\u5931\u8D25 -es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761 \ No newline at end of file +es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761 +message.ok=\u64cd\u4f5c\u6210\u529f +message.error=\u64cd\u4f5c\u5931\u8d25 +message.empty.source=来源不能为空 \ No newline at end of file