diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java index 3af710f1d0..b965382a6f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEnterpriseChangeRecordDTO.java @@ -131,4 +131,14 @@ public class IcEnterpriseChangeRecordDTO implements Serializable { */ private Date updatedTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java index 426e21cc97..e45d9538eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseChangeRecordController.java @@ -1,22 +1,12 @@ package com.epmet.controller; -import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcEnterpriseChangeRecordDTO; -import com.epmet.excel.IcEnterpriseChangeRecordExcel; import com.epmet.service.IcEnterpriseChangeRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; import java.util.Map; @@ -45,38 +35,4 @@ public class IcEnterpriseChangeRecordController { return new Result().ok(data); } - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcEnterpriseChangeRecordDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icEnterpriseChangeRecordService.update(dto); - return new Result(); - } - - @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icEnterpriseChangeRecordService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icEnterpriseChangeRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, IcEnterpriseChangeRecordExcel.class); - } - - - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java index e544e0ef56..119362360c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEnterpriseChangeRecordEntity.java @@ -101,4 +101,14 @@ public class IcEnterpriseChangeRecordEntity extends BaseEpmetEntity { */ private Date latestPatrolTime; + /** + * 原始记录id + */ + private String originId; + + /** + * 操作类型,upd,del + */ + private String type; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java index a0feee5fba..576726412c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dto.form.EnterprisePageFormDTO; import com.epmet.dto.form.EnterprisePatrolFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; +import com.epmet.entity.IcEnterpriseChangeRecordEntity; import com.epmet.entity.IcEnterpriseEntity; import com.epmet.entity.IcEnterprisePatrolAttachmentEntity; import com.epmet.entity.IcEnterprisePatrolRecordEntity; @@ -38,6 +39,7 @@ import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.CoverageService; +import com.epmet.service.IcEnterpriseChangeRecordService; import com.epmet.service.IcEnterpriseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -90,6 +92,8 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper(); @@ -258,12 +266,17 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) { return baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId); } + + /** + * 记录操作日志 + * + * @param origin + * @param type + * @return void + * @author zhy + * @date 2022/8/16 15:36 + */ + private void log(IcEnterpriseEntity origin, String type){ + // 历史记录 + IcEnterpriseChangeRecordEntity record = ConvertUtils.sourceToTarget(origin, IcEnterpriseChangeRecordEntity.class); + record.setId(null); + record.setCreatedBy(null); + record.setCreatedTime(null); + record.setUpdatedBy(null); + record.setUpdatedTime(null); + record.setOriginId(origin.getId()); + record.setType(type); + icEnterpriseChangeRecordService.insert(record); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml index 2255ae431f..eedffe6b44 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseChangeRecordDao.xml @@ -26,6 +26,8 @@ + +