From 81be5442257b51ff2566ee79b8a919f1091fe734 Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 23 Oct 2023 10:38:00 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asms/mapper/LawsAsmsOpenApiMapper.java | 8 + .../asms/mapper/xml/LawsAsmsOpenApiMapper.xml | 4 + .../impl/LawsAsmsOpenApiServiceImpl.java | 43 +++++ .../LawsStandardizationController.java | 176 ++++++++++++++++++ .../entity/LawsStandardization.java | 88 +++++++++ .../mapper/LawsStandardizationMapper.java | 17 ++ .../mapper/xml/LawsStandardizationMapper.xml | 19 ++ .../service/ILawsStandardizationService.java | 76 ++++++++ .../impl/LawsStandardizationServiceImpl.java | 118 ++++++++++++ 9 files changed, 549 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/LawsAsmsOpenApiMapper.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/LawsAsmsOpenApiMapper.java index e4b8ea69..cff1ddb1 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/LawsAsmsOpenApiMapper.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/LawsAsmsOpenApiMapper.java @@ -22,4 +22,12 @@ public interface LawsAsmsOpenApiMapper extends BaseMapper { * @Description: 物理删除字典配置项数据 **/ void removeDictItemBatch(@Param("dictIdList") List dictIdList); + + /** + * @Author: liao + * @Date: 2023/10/23 9:54 + * @Description: 获取asms国内法规的标准性质列表 + **/ + List getStandardTypeList(); + } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/xml/LawsAsmsOpenApiMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/xml/LawsAsmsOpenApiMapper.xml index 2af1a939..36389461 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/xml/LawsAsmsOpenApiMapper.xml +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/mapper/xml/LawsAsmsOpenApiMapper.xml @@ -15,4 +15,8 @@ #{item} + \ No newline at end of file diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index ad0e87a6..d57b7cec 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -289,6 +289,49 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl standardTypeList = lawsAsmsOpenApiMapper.getStandardTypeList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDictItem::getDictId, standardTypeDictId); + queryWrapper.in(SysDictItem::getItemValue, standardTypeList); + List sysDictItems = sysDictItemService.list(queryWrapper); + if (CollectionUtils.isNotEmpty(sysDictItems)) { + List itemValueList = sysDictItems.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); + standardTypeList.removeAll(itemValueList); + } + if (CollectionUtils.isNotEmpty(standardTypeList)) { + List dictItemList = new ArrayList(); + for (int i = 0; i < standardTypeList.size(); i++) { + SysDictItem dictItem = new SysDictItem(); + // 字典id + dictItem.setDictId(standardTypeDictId); + // 是否标签管理显示（显示） + dictItem.setIsTagDict(1); + // 状态（启用） + dictItem.setStatus(1); + dictItem.setDelFlag(0); + // 排序 + dictItem.setSortOrder(i + 1); + + dictItem.setItemValue(standardTypeList.get(i)); + dictItem.setItemText(standardTypeList.get(i)); + + dictItemList.add(dictItem); + } + sysDictItemService.saveBatch(dictItemList); + } + // 状态设置为已同步 + lawsAsmsOpenApi.setStatus("1"); + } else if ("4".equals(lawsAsmsOpenApi.getApiType()) && "B".equals(lawsAsmsOpenApi.getApiUrl())) { + // 国内法规同步到业务表 + List lawsAsmsDomesticList = lawsAsmsDomesticService.list(); + lawsAsmsDomesticList.forEach(lawsAsmsDomestic -> { + + }); + // 状态设置为已同步 + lawsAsmsOpenApi.setStatus("1"); } }); // 同步接口的状态 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java new file mode 100644 index 00000000..de12597d --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -0,0 +1,176 @@ +package com.jero.modules.laws.standardization.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; + + + /** + * @Description: 标准化活动 + * @Author: jero-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +@Api(tags="标准化活动") +@RestController +@RequestMapping("/laws/standardization/lawsStandardization") +@Slf4j +public class LawsStandardizationController extends JeroController { + @Autowired + private ILawsStandardizationService lawsStandardizationService; + + /** + * 分页列表查询 + * + * @param lawsStandardization + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "标准化活动-分页列表查询") + @ApiOperation(value="标准化活动-分页列表查询", notes="标准化活动-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsStandardization lawsStandardization, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = lawsStandardizationService.queryPage(lawsStandardization, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @param lawsStandardization + * @param req + * @return + */ + @AutoLog(value = "标准化活动-列表查询") + @ApiOperation(value="标准化活动-列表查询", notes="标准化活动-列表查询") + @GetMapping(value = "/list") + public Result> queryList(LawsStandardization lawsStandardization, HttpServletRequest req) { + List list = lawsStandardizationService.queryList(lawsStandardization, req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsStandardization + * @return + */ + @AutoLog(value = "标准化活动-添加") + @ApiOperation(value="标准化活动-添加", notes="标准化活动-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsStandardization lawsStandardization) { + lawsStandardizationService.add(lawsStandardization); + return Result.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param lawsStandardization + * @return + */ + @AutoLog(value = "标准化活动-编辑") + @ApiOperation(value="标准化活动-编辑", notes="标准化活动-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsStandardization lawsStandardization) { + lawsStandardizationService.editById(lawsStandardization); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化活动-通过id删除") + @ApiOperation(value="标准化活动-通过id删除", notes="标准化活动-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardizationService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "标准化活动-批量删除") + @ApiOperation(value="标准化活动-批量删除", notes="标准化活动-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ + return Result.error("请选择数据!"); + } + this.lawsStandardizationService.deleteByIds(Arrays.asList(map.get("ids").split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "标准化活动-通过id查询") + @ApiOperation(value="标准化活动-通过id查询", notes="标准化活动-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsStandardization lawsStandardization = lawsStandardizationService.queryById(id); + if(lawsStandardization==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsStandardization); + } + + /** + * 导出excel + * + * @param request + * @param lawsStandardization + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsStandardization lawsStandardization) { + return super.exportXls(request, lawsStandardization, LawsStandardization.class, "标准化活动"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsStandardization.class); + } + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java new file mode 100644 index 00000000..97541a9a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java @@ -0,0 +1,88 @@ +package com.jero.modules.laws.standardization.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 标准化活动 + * @Author: jero-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +@Data +@TableName("laws_standardization") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_standardization对象", description="标准化活动") +public class LawsStandardization implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键ID*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private java.lang.String id; + /**上级节点ID*/ + @Excel(name = "上级节点ID", width = 15) + @ApiModelProperty(value = "上级节点ID") + private java.lang.String pid; + /**标准化活动节点类型(1-标委会、2-分标委)*/ + @Excel(name = "标准化活动节点类型(1-标委会、2-分标委)", width = 15) + @ApiModelProperty(value = "标准化活动节点类型(1-标委会、2-分标委)") + private java.lang.String type; + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private java.lang.String num; + /**会议名称*/ + @Excel(name = "会议名称", width = 15) + @ApiModelProperty(value = "会议名称") + private java.lang.String name; + /**标准化工作领域*/ + @Excel(name = "标准化工作领域", width = 15) + @ApiModelProperty(value = "标准化工作领域") + private java.lang.String workingArea; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String notes; + /**创建人ID*/ + @ApiModelProperty(value = "创建人ID") + private java.lang.String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**修改人ID*/ + @ApiModelProperty(value = "修改人ID") + private java.lang.String updateBy; + /**修改时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "修改时间") + private java.util.Date updateTime; + /**部门code*/ + @Excel(name = "部门code", width = 15) + @ApiModelProperty(value = "部门code") + private java.lang.String orgCode; + /**删除状态(0-正常,1-删除)*/ + @Excel(name = "删除状态(0-正常,1-删除)", width = 15) + @ApiModelProperty(value = "删除状态(0-正常,1-删除)") + private java.lang.String delFlag; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java new file mode 100644 index 00000000..6625f1d5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.laws.standardization.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标准化活动 + * @Author: jero-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +public interface LawsStandardizationMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml new file mode 100644 index 00000000..2e7f2a24 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java new file mode 100644 index 00000000..47533418 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java @@ -0,0 +1,76 @@ +package com.jero.modules.laws.standardization.service; + +import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + +/** + * @Description: 标准化活动 + * @Author: jero-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +public interface ILawsStandardizationService extends IService { + + /** + * 分页查询 + * + * @param lawsStandardization + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryPage(LawsStandardization lawsStandardization, Integer pageNo, Integer pageSize, HttpServletRequest req); + + /** + * 列表查询 + * + * @param lawsStandardization + * @param req + * @return + */ + List queryList(LawsStandardization lawsStandardization, HttpServletRequest req); + + /** + * 保存 + * + * @param lawsStandardization + * @return + */ + void add(LawsStandardization lawsStandardization); + + /** + * 更新 + * + * @param lawsStandardization + * @return + */ + void editById(LawsStandardization lawsStandardization); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsStandardization queryById(String id); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java new file mode 100644 index 00000000..e786c89b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -0,0 +1,118 @@ +package com.jero.modules.laws.standardization.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.jero.modules.laws.standardization.mapper.LawsStandardizationMapper; +import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jero.common.exception.JeroBootException; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.query.QueryGenerator; +import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + + +/** + * @Description: 标准化活动 + * @Author: jero-boot + * @Date: 2023-10-23 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardizationServiceImpl extends ServiceImpl implements ILawsStandardizationService { + + + /** + * 分页查询 + * + * @param lawsStandardization + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryPage(LawsStandardization lawsStandardization, Integer pageNo, Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardization, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + return page(page, queryWrapper); + } + + /** + * 列表查询 + * + * @param lawsStandardization + * @param req + * @return + */ + @Override + public List queryList(LawsStandardization lawsStandardization, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(lawsStandardization, req.getParameterMap())); + } + + /** + * 保存 + * + * @param lawsStandardization + * @return + */ + @Override + public void add(LawsStandardization lawsStandardization) { + Date now = new Date(); + lawsStandardization.setCreateTime(now); + lawsStandardization.setUpdateTime(now); + save(lawsStandardization); + } + + /** + * 更新 + * + * @param lawsStandardization + * @return + */ + @Override + public void editById(LawsStandardization lawsStandardization) { + Date now = new Date(); + lawsStandardization.setUpdateTime(now); + saveOrUpdate(lawsStandardization); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsStandardization queryById(String id) { + return getById(id); + } +}