移动破日志

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.OptionalBomConstant;
@@ -88,6 +89,9 @@ public class OptionalEbomApi extends BaseApi {
 
     @PostMapping("updateDevice")
     @ApiOperation("编辑机型")
+    @LogRecord(success = "移动破-编辑机型,设备编号{{#dto.deviceNo}},操作结果:{{#_ret}}",
+            extra = "{{#dto.toString()}}",
+            bizNo = "{{#dto.rowId}}" ,type = "移动破-编辑机型")
     public ResultVO<Boolean> updateDevice(@RequestBody OptionalEbomMainDTO dto) {
 
         if(dto.getRowId()==null  ){
@@ -125,6 +129,10 @@ public class OptionalEbomApi extends BaseApi {
 
     @PutMapping("updateStatus")
     @ApiOperation("更改设备状态")
+    @LogRecord(success = "移动破-更改设备状态,操作结果:{{#_ret}}",
+            extra = "{{#input.toString()}}",
+            bizNo = "{{#input.rowId}}" ,type = "移动破-更改设备状态")
+
     //@ApiParam("机型id") @RequestParam("rowId") Long rowId, @ApiParam("状态（0 为隐藏 1显示）") @RequestParam("status") Integer status
     public ResultVO<Boolean> updateStatus(@RequestBody OptionalEbomUpdateDTO input ) {
         if(input.getRowId()==null || input.getStatus() ==null){
@@ -145,6 +153,8 @@ public class OptionalEbomApi extends BaseApi {
 
     @DeleteMapping("deleteDevice")
     @ApiOperation("删除设备")
+    @LogRecord(success = "移动破-删除设备,操作结果:{{#_ret}}",
+            bizNo = "{{#rowIds}}" ,type = "移动破-删除设备")
     public ResultVO<Boolean> deleteDevice(@RequestBody List<Long> rowIds) {
         if (  CollectionUtil.isEmpty(rowIds)) {
             return ResultVO.error(STATE.ParamErr, "选择待删除数据");
@@ -170,6 +180,11 @@ public class OptionalEbomApi extends BaseApi {
 
     @PutMapping("updateOptionRemark")
     @ApiOperation("更改选项备注")
+
+    @LogRecord(success = "移动破-更改选项备注,操作结果:{{#_ret}}",
+            extra = "{{#input.toString()}}",
+            bizNo = "{{#input.rowId}}" ,type = "移动破-更改选项备注")
+
     public ResultVO<Boolean> updateOptionRemark(@RequestBody OptionalEbomSubmitEditDTO.OptionalEbomImportChildSubmitDTO input) {
         if(input.getRowId()==null ){
             return ResultVO.error(STATE.ParamErr, "操作数据为空");
@@ -182,6 +197,9 @@ public class OptionalEbomApi extends BaseApi {
 
     @PutMapping("updateOptionStatus")
     @ApiOperation("更改选项状态")
+    @LogRecord(success = "移动破-更改选项状态,操作结果:{{#_ret}}",
+            extra = "{{#input.toString()}}",
+            bizNo = "{{#input.rowId}}" ,type = "移动破-更改选项状态")
     public ResultVO<Boolean> updateOptionStatus(@RequestBody OptionalEbomUpdateDTO input) {
         if(input.getRowId()==null || input.getStatus() ==null){
             return ResultVO.error(STATE.ParamErr, "操作数据为空");
@@ -200,7 +218,10 @@ public class OptionalEbomApi extends BaseApi {
     }
 
     @DeleteMapping("deleteOption")
-    @ApiOperation("删除选配数据")
+    @ApiOperation("删除选项数据")
+    @LogRecord(success = "移动破-删除选项数据,操作结果:{{#_ret}}",
+
+            bizNo = "{{#rowIds}}" ,type = "移动破-删除选项数据")
     public ResultVO<Boolean> deleteOption(@RequestBody List<Long> rowIds) {
 
         if (  CollectionUtil.isEmpty(rowIds)) {
@@ -216,6 +237,9 @@ public class OptionalEbomApi extends BaseApi {
 
     @PostMapping("optionAdd")
     @ApiOperation("添加选项数据")
+    @LogRecord(success = "移动破-添加选项数据,操作结果:{{#_ret}}",
+            extra = "{{#bom.toString()}}",
+            bizNo = "" ,type = "移动破-添加选项数据")
     public ResultVO<Boolean> optionAdd(@RequestBody OptionalEbomImportChildAddDTO dto) {
         if (dto == null) {
             return ResultVO.error("添加数据空");
@@ -257,7 +281,7 @@ public class OptionalEbomApi extends BaseApi {
 
 
     @PostMapping("ebomEditTree")
-    @ApiOperation("编辑机型下选配")
+    @ApiOperation("获取机型下选项")
     public ResultVO<OptionalEbomConfigAggregVO> ebomEditTree(@RequestBody OptionalEbomImportChildQuery query) {
 
         if(query.getRootRowId()==null ){
@@ -270,7 +294,10 @@ public class OptionalEbomApi extends BaseApi {
 
 
     @PutMapping("submitEditTree")
-    @ApiOperation("提交设置标配")
+    @ApiOperation("编辑机型下选项")
+    @LogRecord(success = "移动破-编辑机型下选项,机型id-{{#dto.deviceInfo.rowId}} ,操作结果:{{#_ret}}",
+            extra = "{{#dto.toString()}}",
+            bizNo = "{{#dto.deviceInfo.rowId}}" ,type = "移动破-编辑机型下选项")
     public ResultVO<Boolean> submitEditTree(@RequestBody OptionalEbomSubmitEditDTO dto) {
         return ResultVO.success(aggregOptionConfigService.submitEbomEditTree(dto));
     }
@@ -288,6 +315,9 @@ public class OptionalEbomApi extends BaseApi {
 
     @DeleteMapping("deleteTmp")
     @ApiOperation("删除暂存")
+    @LogRecord(success = "移动破-删除暂存,操作结果:{{#_ret}}",
+            extra = "{{#rowIds.toString()}}",
+            bizNo = "{{#rowIds.toString()}}" ,type = "移动破-删除暂存")
     public ResultVO<Boolean> deleteTmp(@RequestBody List<Long> rowIds) {
 
         if(CollectionUtil.isEmpty(rowIds)){
@@ -308,7 +338,11 @@ public class OptionalEbomApi extends BaseApi {
     }
 
     @PostMapping ("submitTmpOptionTree")
-    @ApiOperation("变更暂存数据")
+    @ApiOperation("移动破-变更暂存数据")
+    @LogRecord(success = "移动破-变更暂存数据,操作结果:{{#_ret}}",
+            extra = "{{#dto.toString()}}",
+            bizNo = "{{#dto.rowId}}" ,type = "移动破-变更暂存数据")
+
     public ResultVO<Boolean> submitTmpOptionTree(@RequestBody OptionalEbomConfigDTO   dto) {
 
 
@@ -320,7 +354,10 @@ public class OptionalEbomApi extends BaseApi {
 
 
     @PostMapping ("createTmpOptionTree")
-    @ApiOperation("提交暂存数据,rowId设备id")
+    @ApiOperation("移动破-提交暂存数据,rowId设备id")
+    @LogRecord(success = "生成暂存数据,操作结果:{{#_ret}}",
+            extra = "{{#dto.toString()}}",
+            bizNo = "{{#bom.rowId}}" ,type = "移动破-生成暂存数据")
     public ResultVO<OptionalEbomConfigVO> createTmpOptionTree(@RequestBody OptionalEbomConfigDTO   dto) {
 
 
@@ -362,6 +399,9 @@ public class OptionalEbomApi extends BaseApi {
      */
     @PostMapping("publish")
     @ApiOperation("发布生成")
+    @LogRecord(success = "移动破-发布生成,操作结果:{{#_ret}}",
+            extra = "{{#dto.toString()}}",
+            bizNo = "{{#dto.rowId}}" ,type = "移动破-发布生成")
     public ResultVO<String> publish(@RequestBody OptionalEbomPublishAddDTO dto) {
 
         if(Objects.isNull(dto.getRowId())){
@@ -382,6 +422,8 @@ public class OptionalEbomApi extends BaseApi {
 
     @GetMapping("exportPreview")
     @ApiOperation("预览导出")
+    @LogRecord(success = "移动破-预览导出,操作结果:{{#_ret}}", bizNo = "",
+            extra = "{{#rowId}}" ,type = "移动破-预览导出")
     public void  exportPreview(HttpServletResponse response,@ApiParam("暂存id") @RequestParam("rowId") Long rowId) throws  Exception {
         OptionalEbomConfigTmpAggregVO voObj=  aggregOptionConfigService.publishPreviewTree(rowId);
         String fileName= StrUtil.format("{}预览导出{}",voObj.getDeviceInfo().getDeviceName(),System.currentTimeMillis());
@@ -395,6 +437,8 @@ public class OptionalEbomApi extends BaseApi {
 
     @GetMapping("exportProducePreview")
     @ApiOperation("生产预览导出")
+    @LogRecord(success = "移动破-生产预览导出,操作结果:{{#_ret}}", bizNo = "",
+            extra = "{{#rowId}}" ,type = "移动破-生产预览导出")
     public void  exportProducePreview(HttpServletResponse response,@ApiParam("暂存id") @RequestParam("rowId") Long rowId) throws  Exception {
         OptionalEbomConfigTmpAggregVO voObj=  aggregOptionConfigService.publishPreviewTree(rowId);
         String fileName= StrUtil.format("{}生产预览导出{}",voObj.getDeviceInfo().getDeviceName(),System.currentTimeMillis());
@@ -407,6 +451,8 @@ public class OptionalEbomApi extends BaseApi {
 
     @GetMapping("exportDeviceMaterial")
     @ApiOperation("设备物料导出")
+    @LogRecord(success = "移动破-设备物料导出,操作结果:{{#_ret}}", bizNo = "",
+            extra = "{{#rowId}}" ,type = "移动破-设备物料导出")
     public void  exportDeviceMaterial(HttpServletResponse response,@ApiParam("设备id") @RequestParam("rowId") Long rowId) throws  Exception {
         OptionalEbomImportChildQuery query=new OptionalEbomImportChildQuery();
         query.setRootRowId(rowId);

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import com.nflg.product.base.core.api.BaseApi;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
@@ -106,6 +107,10 @@ public class OptionalMbomApi extends BaseApi {
 
     @PostMapping("delete")
     @ApiOperation("删除物料")
+
+    @LogRecord(success = "移动破-删除物料,操作结果:{{#_ret}}",
+            extra = "{{#rowIds.toString()}}",
+            bizNo = "{{#rowIds.toString()}}" ,type = "移动破-删除物料")
     public ResultVO<Boolean > deleteMaterial(@RequestBody List<Long> rowIds ) {
 
         if(CollectionUtil.isEmpty(rowIds)){
@@ -119,6 +124,10 @@ public class OptionalMbomApi extends BaseApi {
     }
     @PostMapping("add")
     @ApiOperation("添加物料")
+    @LogRecord(success = "移动破-添加物料,操作结果:{{#_ret}}",
+            extra = "{{#bom.toString()}}",
+            bizNo = "" ,type = "移动破-添加物料")
+
     public ResultVO<Boolean > addMaterial(@RequestBody OptionalMbomMaterialAddDTO dto ) {
         if(Objects.isNull(dto.getRowId())){
             throw new NflgBusinessException(STATE.Error, "rowId不能为空" );
@@ -150,6 +159,8 @@ public class OptionalMbomApi extends BaseApi {
 
     @GetMapping("importSap")
     @ApiOperation("导入sap")
+    @LogRecord(success = "移动破-导入sap,操作结果:{{#_ret}}", bizNo = "",
+            extra = "{{#rowId}}" ,type = "移动破-导入sap")
     public ResultVO<Boolean > importSap(@ApiParam("行Id") @RequestParam("rowId") Long rowId) {
 
         if(Objects.isNull(rowId)){

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 
+import com.mzt.logapi.context.LogRecordContext;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.base.core.vo.PageVO;
@@ -117,7 +118,7 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
 
         OptionalEbomConfigVO optionalEbomConfigVO = Convert.convert(new TypeReference<OptionalEbomConfigVO>() {
         }, optionalEbomConfigEntity);
-
+        LogRecordContext.putVariable("bom",optionalEbomConfigVO);
         return optionalEbomConfigVO;
 
     }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 
+import com.mzt.logapi.context.LogRecordContext;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.OptionalBomConstant;
@@ -130,6 +131,9 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
             });
 
         }
+
+        LogRecordContext.putVariable("bom",optionList);
+
         return true;
 
     }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.google.common.collect.ImmutableList;
+import com.mzt.logapi.context.LogRecordContext;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.base.core.vo.PageVO;
@@ -354,6 +355,9 @@ public ResultVO<Boolean> importSap(Long rowId){
 
         this.saveOrUpdateBatch(entityList);
 
+        LogRecordContext.putVariable("bom",entityList);
+
+
     }