From aa5f4c9c85bd5da179d8f038e88667ef304fef8a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 20 Sep 2023 10:51:35 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E7=94=9F=E6=88=90=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A1=A8=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareInfoController.java | 8 +- .../common/service/ILawsCommonService.java | 20 +++++ .../service/impl/LawsCommonServiceImpl.java | 20 +++++ .../EnterpriseStandardAuthDeptService.java | 4 +- .../EnterpriseStandardAuthUserService.java | 4 +- ...EnterpriseStandardAuthDeptServiceImpl.java | 13 ++- ...EnterpriseStandardAuthUserServiceImpl.java | 12 +-- .../controller/LawsEnterpriseController.java | 23 ++--- .../standard/entity/LawsStandardFile.java | 89 +++++++++++++++++++ ...n.java => LawsStandardTempPermission.java} | 3 +- .../mapper/LawsStandardFileMapper.java | 18 ++++ .../mapper/xml/LawsStandardFileMapper.xml | 26 ++++++ ...va => ILawsEnterpriseStandardService.java} | 2 +- .../service/ILawsStandardFileService.java | 13 +++ ...=> LawsEnterpriseStandardServiceImpl.java} | 9 +- .../impl/LawsStandardFileServiceImpl.java | 25 ++++++ .../LawsStandardCollectionController.java | 6 +- .../LawsStandardSharingController.java | 6 +- .../LawsStandardCollectionServiceImpl.java | 6 +- .../LawsEnterpriseStandardTest.java | 6 +- 20 files changed, 257 insertions(+), 56 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardFile.java rename laws-modules/src/main/java/com/jero/modules/laws/standard/entity/{StandardTempPermission.java => LawsStandardTempPermission.java} (95%) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsStandardFileMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsStandardFileMapper.xml rename laws-modules/src/main/java/com/jero/modules/laws/standard/service/{EnterpriseStandardService.java => ILawsEnterpriseStandardService.java} (83%) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsStandardFileService.java rename laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/{EnterpriseStandardServiceImpl.java => LawsEnterpriseStandardServiceImpl.java} (73%) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsStandardFileServiceImpl.java diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index a8e91081..f6acc783 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -20,7 +20,7 @@ import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.system.util.MyStringUtils; @@ -60,7 +60,7 @@ public class SarFileCompareInfoController extends JeroController> getCommonPage(Map parameterMap); + /** + * 获取导出的数据 + * @param parameterMap + * @param headers + * @return + */ IPage> getExportData(Map parameterMap, List headers); + /** + * 获取导出表头 + * @param parameterMap + * @return + */ List getExportHeader(Map parameterMap); + /** + * 获取导出表头（带文件字段） + * @param parameterMap + * @return + */ + List getExportHeaderWithFile(Map parameterMap); + + + /** * @Author: liao * @Date: 2023/8/24 9:09 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 a0b2a523..866a5689 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 @@ -189,6 +189,23 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return fieldList; } + @Override + public List getExportHeaderWithFile(Map parameterMap) { + // 获取操作模块 + String module = (String) parameterMap.get(FieldCommon.MODULE); + + // 获取要操作的表名 + String tableName = TableNameEnum.getTableName(module); + // 获取全部字段 + List fieldList = lawsCommonMapper.getFieldList(tableName); + // 筛选表单显示的字段（传id查表单） + // 详情显示 + fieldList = fieldList.stream() + .filter(lawsTag -> YesOrNoEnum.YES.getValue().equals(lawsTag.getIsShowForm().toString())) + .collect(Collectors.toList()); + return fieldList; + } + /** * @Author: liao * @Date: 2023/9/11 14:49 @@ -864,6 +881,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 获取数据 IPage> commonPage = this.getExportData(parameterMap, headers); List> records = commonPage.getRecords(); + // 获取所有标准主键id + + // 将文件名设置回数据列表 XSSFWorkbook workbook = new XSSFWorkbook(); XSSFSheet sheet = workbook.createSheet(sheetName); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java index f4767257..26205804 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java @@ -2,7 +2,7 @@ package com.jero.modules.laws.enterprise.service; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standard.entity.StandardTempPermission; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; /** * @author ThinkBook @@ -11,5 +11,5 @@ import com.jero.modules.laws.standard.entity.StandardTempPermission; */ public interface EnterpriseStandardAuthDeptService extends IService { - void saveTempPermission(StandardTempPermission standardTempPermission); + void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java index 096404dd..84156fa9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java @@ -2,7 +2,7 @@ package com.jero.modules.laws.enterprise.service; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standard.entity.StandardTempPermission; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; /** * @author ThinkBook @@ -11,5 +11,5 @@ import com.jero.modules.laws.standard.entity.StandardTempPermission; */ public interface EnterpriseStandardAuthUserService extends IService { - void saveTempPermission(StandardTempPermission standardTempPermission); + void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java index b9f15249..1278be28 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java @@ -3,10 +3,9 @@ package com.jero.modules.laws.enterprise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper; -import com.jero.modules.laws.standard.entity.StandardTempPermission; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,15 +25,15 @@ public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl esAuthDepts = new ArrayList<>(); - for (String standardNo : standardTempPermission.getStandardNoList()) { - for (String deptId : standardTempPermission.getDeptIdList()) { + for (String standardNo : lawsStandardTempPermission.getStandardNoList()) { + for (String deptId : lawsStandardTempPermission.getDeptIdList()) { EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept(); enterpriseStandardAuthDept.setAuthDept(deptId); enterpriseStandardAuthDept.setStandardNo(standardNo); - if (standardTempPermission.getAuthDate() != null) { - enterpriseStandardAuthDept.setAuthExpireDate(standardTempPermission.getAuthDate()); + if (lawsStandardTempPermission.getAuthDate() != null) { + enterpriseStandardAuthDept.setAuthExpireDate(lawsStandardTempPermission.getAuthDate()); } esAuthDepts.add(enterpriseStandardAuthDept); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index 89e1545f..8a0c17d9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -5,7 +5,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper; -import com.jero.modules.laws.standard.entity.StandardTempPermission; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,15 +24,15 @@ import java.util.List; public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl implements EnterpriseStandardAuthUserService { @Override - public void saveTempPermission(StandardTempPermission standardTempPermission) { + public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) { List esAuthUsers = new ArrayList<>(); - for (String standardNo : standardTempPermission.getStandardNoList()) { - for (String userId : standardTempPermission.getUserIdList()) { + for (String standardNo : lawsStandardTempPermission.getStandardNoList()) { + for (String userId : lawsStandardTempPermission.getUserIdList()) { EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser(); enterpriseStandardAuthUser.setAuthUser(userId); enterpriseStandardAuthUser.setStandardNo(standardNo); - if (standardTempPermission.getAuthDate() != null) { - enterpriseStandardAuthUser.setAuthExpireDate(standardTempPermission.getAuthDate()); + if (lawsStandardTempPermission.getAuthDate() != null) { + enterpriseStandardAuthUser.setAuthExpireDate(lawsStandardTempPermission.getAuthDate()); } esAuthUsers.add(enterpriseStandardAuthUser); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 402c7a0c..934d8d0e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -1,6 +1,5 @@ package com.jero.modules.laws.standard.controller; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; @@ -11,9 +10,8 @@ import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; -import com.jero.modules.laws.standard.entity.StandardTempPermission; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; @@ -22,20 +20,11 @@ import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -173,14 +162,14 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-临时权限设置") @ApiOperation(value="企业法规标准-临时权限设置", notes="企业法规标准-临时权限设置") @PostMapping(value = "/tempPermission") - public Result tempPermission(@RequestBody StandardTempPermission standardTempPermission) { - String userIds = standardTempPermission.getUserIds(); - String deptIds = standardTempPermission.getDeptIds(); + public Result tempPermission(@RequestBody LawsStandardTempPermission lawsStandardTempPermission) { + String userIds = lawsStandardTempPermission.getUserIds(); + String deptIds = lawsStandardTempPermission.getDeptIds(); if (Objects.nonNull(userIds) && !userIds.isEmpty()) { - esAuthUserService.saveTempPermission(standardTempPermission); + esAuthUserService.saveTempPermission(lawsStandardTempPermission); } if (Objects.nonNull(deptIds) && !deptIds.isEmpty()) { - esAuthDeptService.saveTempPermission(standardTempPermission); + esAuthDeptService.saveTempPermission(lawsStandardTempPermission); } return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardFile.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardFile.java new file mode 100644 index 00000000..1e1b31d9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardFile.java @@ -0,0 +1,89 @@ +package com.jero.modules.laws.standard.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * + * @TableName laws_standard_file + */ +@Data +@TableName("laws_update_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_update_record对象", description="更新记录") +public class LawsStandardFile implements Serializable { + /** + * 主键ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private String id; + + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String orgCode; + + /** + * 标准编号 + */ + @ApiModelProperty(value = "标准编号") + private String standardNo; + + /** + * 文件id + */ + @ApiModelProperty(value = "文件id") + private String fileId; + + /** + * 文件类型 发布稿/修改单/报批稿 + */ + @ApiModelProperty(value = "文件类型 发布稿/修改单/报批稿") + private String fileType; + + /** + * 所属模块编码 + */ + @ApiModelProperty(value = "所属模块编码") + private String moduleCode; + + @TableField(exist = false) + private static final long serialVersionUID = 1978687668756786786L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java similarity index 95% rename from laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java rename to laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java index f7c53d2f..5d662b0d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java @@ -9,7 +9,6 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -23,7 +22,7 @@ import java.util.stream.Collectors; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) -public class StandardTempPermission { +public class LawsStandardTempPermission { @NotBlank @ApiModelProperty(value = "标准标号") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsStandardFileMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsStandardFileMapper.java new file mode 100644 index 00000000..24c6c500 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsStandardFileMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.laws.standard.mapper; + +import com.jero.modules.laws.standard.entity.LawsStandardFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_standard_file】的数据库操作Mapper +* @createDate 2023-09-20 10:45:16 +* @Entity com.jero.modules.laws.standard.entity.StandardFile +*/ +public interface LawsStandardFileMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsStandardFileMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsStandardFileMapper.xml new file mode 100644 index 00000000..db1d6e51 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsStandardFileMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + standard_no,file_id,file_type, + module_code + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java similarity index 83% rename from laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java rename to laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java index cb0538d3..d7f6fab8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service * @createDate 2023-09-18 14:49:51 */ -public interface EnterpriseStandardService extends IService { +public interface ILawsEnterpriseStandardService extends IService { /** * 通过编号查查询 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsStandardFileService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsStandardFileService.java new file mode 100644 index 00000000..86af8cd7 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsStandardFileService.java @@ -0,0 +1,13 @@ +package com.jero.modules.laws.standard.service; + +import com.jero.modules.laws.standard.entity.LawsStandardFile; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_standard_file】的数据库操作Service +* @createDate 2023-09-20 10:45:16 +*/ +public interface ILawsStandardFileService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java similarity index 73% rename from laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java rename to laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java index e63962b0..4c800df3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java @@ -3,11 +3,13 @@ package com.jero.modules.laws.standard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author ThinkBook @@ -15,8 +17,9 @@ import org.springframework.stereotype.Service; * @createDate 2023-09-18 14:49:51 */ @Service -public class EnterpriseStandardServiceImpl extends ServiceImpl - implements EnterpriseStandardService{ +@Transactional(rollbackFor = JeroBootException.class) +public class LawsEnterpriseStandardServiceImpl extends ServiceImpl + implements ILawsEnterpriseStandardService { @Override public LawsEnterpriseStandard queryByStandardNumber(String standardNumber) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsStandardFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsStandardFileServiceImpl.java new file mode 100644 index 00000000..70ce162a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsStandardFileServiceImpl.java @@ -0,0 +1,25 @@ +package com.jero.modules.laws.standard.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.laws.standard.entity.LawsStandardFile; +import com.jero.modules.laws.standard.service.ILawsStandardFileService; +import com.jero.modules.laws.standard.mapper.LawsStandardFileMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** +* @author ThinkBook +* @description 针对表【laws_standard_file】的数据库操作Service实现 +* @createDate 2023-09-20 10:45:16 +*/ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class LawsStandardFileServiceImpl extends ServiceImpl + implements ILawsStandardFileService { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index 9126e8b9..509d6de2 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -13,7 +13,7 @@ import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.personal.entity.LawsStandardCollection; @@ -51,7 +51,7 @@ public class LawsStandardCollectionController extends JeroController enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId()); + LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardCollection.getStandardId()); lawsStandardCollection.setStandardClass(standard.getCategoryCode()); lawsStandardCollection.setStandardName(standard.getStandardName()); lawsStandardCollection.setCollectorId(sysUser.getId()); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index be42ff5f..ced09991 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -9,7 +9,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; @@ -54,7 +54,7 @@ public class LawsStandardSharingController extends JeroController