Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java

@@ -209,6 +209,7 @@ public class OrderController {
     //    api-生产单导入
     @GetMapping("getApiData")
     @Operation(summary = "生产单api数据导入新增")
+    @OperateLog(module="管理后台 - 生产单管理",name = "生产单api数据导入新增",type = IMPORT)
     @Parameter(name = "orderNo", description = "原订单号", required = true, example = "20230809027818")
     @PreAuthorize("@ss.hasPermission('production:manager-list:create')")
     public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo){
@@ -451,6 +452,7 @@ public class OrderController {
 
     @PostMapping("/get-platesDetailsPage")
     @Operation(summary = "生产单详情-板件详细信息(分页)")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPlatesDetailReqVO>> platesDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
         if (orderBodyPageRespVO.getDeleted() == null) {
@@ -464,6 +466,7 @@ public class OrderController {
 
     @PostMapping("/get-partsDetailsPage")
     @Operation(summary = "生产单详情-配件详细信息(分页)")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPartsRespVO>> partsDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
         if (orderBodyPageRespVO.getDeleted() == null) {
@@ -483,6 +486,7 @@ public class OrderController {
 
     @PostMapping("/get-goodsDetailsPage")
     @Operation(summary = "生产单详情-板材详细信息(分页)")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderGoodsDetailRespVO>> goodsDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
         if (orderBodyPageRespVO.getDeleted() == null) {
@@ -496,6 +500,7 @@ public class OrderController {
 
     @PostMapping("/get-componentDetailsPage")
     @Operation(summary = "生产单详情-组件详细信息(分页)")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
     public CommonResult<PageResult<OrderPartsRespVO>> componentDetails(@Valid @RequestBody OrderBodyPageRespVO orderBodyPageRespVO) {
         if (orderBodyPageRespVO.getDeleted() == null) {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java

@@ -29,7 +29,7 @@ import java.io.IOException;
 import java.util.List;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
-import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 排单")
 @RestController
@@ -108,7 +108,7 @@ public class PlanController {
 
 
 
-    @PostMapping("/setSort")
+    @PutMapping("/setSort")
     @Operation(summary = "设置排单优先级")
     @PreAuthorize("@ss.hasPermission('placeorder:priority')")
     public CommonResult<Boolean> setSort(@Valid  @NotEmpty(message = "参数不能空") @Size(max = 2,message = "做多两条数据") @RequestBody List<SortVO> sortVos) {
@@ -188,6 +188,7 @@ public class PlanController {
 
     @PostMapping("getPlanGoodsList")
     @Operation(summary = "未排单混单获取分类的排单信息")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
     public CommonResult<List<PlanActualGoodsResp>> getPlanGoodsList(@Valid @RequestBody SavePlanPlateList savePlanPlateList) {
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.ElasticsearchException;
 import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
 import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
@@ -216,26 +217,25 @@ public class EsUtils {
         }
     }
 
-    public void deleteEsDocument(String filedName1,String filedName2, Long value1,Long value2, String index) {
-
+    public void deleteEsDocument(String fieldName1,String fieldName2, Long value1,Long value2, String index) {
         DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
         builder.index(index);
 
-        builder.query(q->q.bool(b->b.filter(f->{
-            f.term(t->t.field(filedName1).value(value1));
-            f.term(t->t.field(filedName2).value(value2));
-            return f;
-        })));
+        builder.query(q -> q.bool(b -> b.filter(
+                Query.of(q1 -> q1.term(t -> t.field(fieldName1).value(value1))),
+                Query.of(q2 -> q2.term(t -> t.field(fieldName2).value(value2)))
+        )));
 
         try {
             elasticsearchClient.deleteByQuery(builder.build());
         } catch (IOException | ElasticsearchException e) {
-            log.error("ES文档删除失败：", e.getMessage());
+            log.error("ES文档删除失败：{}", e.getMessage());
             throw new ServiceException(ES_DATA_ERROR);
         }
     }
 
 
+
     public void deleteEsDocument(String filedName1,String filedName2, Long value1,List<Long> values2, String index) {
 
         List<FieldValue> fieldValues = values2.stream().map(FieldValue::of).toList();
@@ -243,11 +243,10 @@ public class EsUtils {
         DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
         builder.index(index);
 
-        builder.query(q->q.bool(b->b.filter(f->{
-            f.term(t->t.field(filedName1).value(value1));
-            f.terms(t->t.field(filedName2).terms(v2->v2.value(fieldValues)));
-            return f;
-        })));
+        builder.query(q-> q.bool(b-> b.filter(
+                Query.of(q1->q1.term(t->t.field(filedName1).value(value1))),
+                Query.of(q2-> q2.terms(t->t.field(filedName2).terms(v2-> v2.value(fieldValues))))
+        )));
 
         try {
             elasticsearchClient.deleteByQuery(builder.build());

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java

@@ -41,7 +41,7 @@ public class RemainPlateController {
     private RemainPlateService remainPlateService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建生产单余料板表(单个)")
+    @Operation(summary = "添加余料（单个）")
     @PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:create','placeorder:optimize')")
     public CommonResult<Boolean> createRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO createReqVO) {
         return success(remainPlateService.createRemainPlate(createReqVO));
@@ -55,7 +55,7 @@ public class RemainPlateController {
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新生产单余料板表")
+    @Operation(summary = "余料修改")
     @PreAuthorize("@ss.hasPermission('manage:remain-plate:update')")
     public CommonResult<Boolean> updateRemainPlate(@Valid @RequestBody RemainPlateSaveReqVO updateReqVO) {
         remainPlateService.updateRemainPlate(updateReqVO);
@@ -82,7 +82,7 @@ public class RemainPlateController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除生产单余料板表")
+    @Operation(summary = "删除余料")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('manage:remain-plate:delete')")
     public CommonResult<Boolean> deleteRemainPlate(@RequestParam("id") Set<Long> ids) {

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java

@@ -2,6 +2,7 @@ package com.cf.imes.module.report.controller.admin.dataset;
 
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO;
 import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetRespVO;
 import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO;
@@ -16,10 +17,11 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.List;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 /**
  * 报表数据集控制器
@@ -37,6 +39,7 @@ public class ReportDatasetController {
 
     @PutMapping("/dataset")
     @Operation(summary = "创建报表数据集")
+    @OperateLog(type = CREATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Long> createDataset(@Valid @RequestBody ReportDatasetSaveReqVO createReqVO) {
         return success(datasetService.createDataset(createReqVO));
@@ -44,6 +47,7 @@ public class ReportDatasetController {
 
     @PostMapping("/dataset")
     @Operation(summary = "更新报表数据集")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Boolean> updateDataset(@Valid @RequestBody ReportDatasetSaveReqVO updateReqVO) {
         datasetService.updateDataset(updateReqVO);

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java

@@ -6,11 +6,8 @@ import com.bstek.datasource.service.DataSourceService;
 import com.bstek.ureport.definition.dataset.Field;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
-import com.cf.imes.module.report.controller.admin.datasource.vo.ReportBeanDatasourceRespVO;
-import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourcePreviewReqVO;
-import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceRespVO;
-import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO;
-import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceTestConnReqVO;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
+import com.cf.imes.module.report.controller.admin.datasource.vo.*;
 import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO;
 import com.cf.imes.module.report.service.datasource.ReportDatasourceService;
 import com.cf.imes.module.report.utils.TenantParamsUtils;
@@ -25,13 +22,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.error;
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASOURCE_CONNECT_FAIL;
 
 /**
@@ -56,6 +54,7 @@ public class ReportDatasourceController {
 
     @PutMapping("/datasource")
     @Operation(summary = "创建报表数据源")
+    @OperateLog(type = CREATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Long> createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) {
         return success(datasourceService.createDatasource(createReqVO));
@@ -63,6 +62,7 @@ public class ReportDatasourceController {
 
     @PostMapping("/datasource")
     @Operation(summary = "更新报表数据源")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Boolean> updateDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO updateReqVO) {
         datasourceService.updateDatasource(updateReqVO);
@@ -128,6 +128,7 @@ public class ReportDatasourceController {
 
     @PostMapping("/datasource/tables")
     @Operation(summary = "获取数据库表列表")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<List<Map<String, String>>> getDatasourceTables(@RequestBody @Valid ReportDatasourceTestConnReqVO reqVO) {
         return success(ureportDataSourceService.selectTableList(BeanUtils.toBean(reqVO, DataSourceInfo.class)));
@@ -135,6 +136,7 @@ public class ReportDatasourceController {
 
     @PostMapping("/datasource/table/fields")
     @Operation(summary = "获取数据源表字段")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<List<Field>> getDatasourceTableFields(@RequestBody @Valid ReportDatasourcePreviewReqVO reqVO) {
         return success(datasourceService.getTableFields(tenantParamsUtils.prepareTenantParam(reqVO)));
@@ -142,6 +144,7 @@ public class ReportDatasourceController {
 
     @PostMapping("/datasource/preview")
     @Operation(summary = "数据源预览")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Map<String, Object>> previewData(@RequestBody @Valid ReportDatasourcePreviewReqVO reqVO) {
         return success(ureportDataSourceService.previewData(tenantParamsUtils.prepareTenantParam(reqVO)));

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java

@@ -12,11 +12,8 @@ import com.bstek.ureport.utils.StringUtils;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
-import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateCommonPreviewReqVO;
-import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplatePreviewReqVO;
-import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqVO;
-import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateRespVO;
-import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
+import com.cf.imes.module.report.controller.admin.template.vo.*;
 import com.cf.imes.module.report.service.template.ReportTemplateService;
 import com.cf.imes.module.report.validation.template.ReportTemplateProducerTypeInEnum;
 import io.swagger.v3.oas.annotations.Operation;
@@ -38,12 +35,12 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
 
 /**
  * 报表模板信息控制器
@@ -62,6 +59,7 @@ public class ReportTemplateController {
 
     @PutMapping("/template")
     @Operation(summary = "创建报表模板")
+    @OperateLog(type = CREATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<ReportTemplateRespVO> createTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) {
         return success(templateService.createReportTemplate(createReqVO));
@@ -76,6 +74,7 @@ public class ReportTemplateController {
 
     @PostMapping("/template")
     @Operation(summary = "更新报表模板")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<ReportTemplateRespVO> updateTemplate(@Valid @RequestBody ReportTemplateSaveReqVO updateReqVO) {
         return success(templateService.updateReportTemplate(updateReqVO));
@@ -110,6 +109,7 @@ public class ReportTemplateController {
 
     @PostMapping("/template/preview")
     @Operation(summary = "模板预览")
+    @OperateLog(enable = false)
     @PreAuthorize("@ss.hasPermission('report:preview')")
     public CommonResult<HtmlReport> preview(@RequestBody ReportTemplatePreviewReqVO reqVO) {
         return success(templateService.preview(reqVO));
@@ -117,6 +117,7 @@ public class ReportTemplateController {
 
     @PostMapping("/template/preview/common/")
     @Operation(summary = "模板通用预览")
+    @OperateLog(enable = false)
     public CommonResult<HtmlReport> commonPreview(@RequestBody ReportTemplateCommonPreviewReqVO reqVO) {
         return success(templateService.commonPreview(reqVO));
     }
@@ -151,6 +152,7 @@ public class ReportTemplateController {
 
     @PostMapping("/template/excel/import")
     @Operation(summary = "导入excel模板")
+    @OperateLog(type = IMPORT)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public ReportDefinitionWrapper importExcel(@RequestParam("file") MultipartFile file) {
         ReportDefinition report = ExcelParserUtils.parser(file);
@@ -217,6 +219,7 @@ public class ReportTemplateController {
 
     @PutMapping("/xml")
     @Operation(summary = "导入模版")
+    @OperateLog(type = IMPORT)
     @PreAuthorize("@ss.hasPermission('report:design')")
     public CommonResult<Boolean> importTemplate(@RequestParam("name") @NotEmpty(message = "模版名称不能为空") String name, @RequestParam("file") MultipartFile file) {
         templateService.importTemplate(name, file);

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -382,22 +382,22 @@ public class ErrorCodeConstants {
 
 
 
-    //=========== 系统配置 1-002-041-000 ============
-    public static final ErrorCode TOKEN_APP_TYPE_EXIST = new ErrorCode(1_002_041_001, "当前应用以存在token配置，无法继续新增");
-    public static final ErrorCode TOKEN_CONFIG_NOT_EXISTS = new ErrorCode(1_002_041_002, "当前应用的token配置不存在");
-    public static final ErrorCode TOKEN_TIME_IS_EXPIRES = new ErrorCode(1_002_041_003, "当前token已过期，请重新配置或延长时间");
-    public static final ErrorCode TOKEN_DATA_ERROR = new ErrorCode(1_002_041_004, "token解析失败，请重新配置token");
-    public static final ErrorCode TOKEN_APP_TYPE_ERROR = new ErrorCode(1_002_041_005, "token解析失败，当前token和应用不匹配，请重新配置");
-    public static final ErrorCode TOKEN_APP_TYPE_NO_UPDATE = new ErrorCode(1_002_041_006, "应用名称不允许更改");
-    public static final ErrorCode TOKEN_DATA_IS_NULL = new ErrorCode(1_002_041_007, "当前token的配置为空，无需删除");
-    public static final ErrorCode TOKEN_EXPIRES_TIME_IS_NULL = new ErrorCode(1_002_041_008, "当前未选择有效时间，请选择再进行新增");
-    public static final ErrorCode TOKEN_EXPIRES_TIME_DATA_ERROR = new ErrorCode(1_002_041_009, "当前选择的有效时间已过期，请增加有效时间");
-    public static final ErrorCode INSERT_TOKEN_DATA_ERROR = new ErrorCode(1_002_041_010, "token新增失败，请重新尝试");
+    //=========== 系统配置 1-002-042-000 ============
+    public static final ErrorCode TOKEN_APP_TYPE_EXIST = new ErrorCode(1_002_042_001, "当前应用以存在token配置，无法继续新增");
+    public static final ErrorCode TOKEN_CONFIG_NOT_EXISTS = new ErrorCode(1_002_042_002, "当前应用的token配置不存在");
+    public static final ErrorCode TOKEN_TIME_IS_EXPIRES = new ErrorCode(1_002_042_003, "当前token已过期，请重新配置或延长时间");
+    public static final ErrorCode TOKEN_DATA_ERROR = new ErrorCode(1_002_042_004, "token解析失败，请重新配置token");
+    public static final ErrorCode TOKEN_APP_TYPE_ERROR = new ErrorCode(1_002_042_005, "token解析失败，当前token和应用不匹配，请重新配置");
+    public static final ErrorCode TOKEN_APP_TYPE_NO_UPDATE = new ErrorCode(1_002_042_006, "应用名称不允许更改");
+    public static final ErrorCode TOKEN_DATA_IS_NULL = new ErrorCode(1_002_042_007, "当前token的配置为空，无需删除");
+    public static final ErrorCode TOKEN_EXPIRES_TIME_IS_NULL = new ErrorCode(1_002_042_008, "当前未选择有效时间，请选择再进行新增");
+    public static final ErrorCode TOKEN_EXPIRES_TIME_DATA_ERROR = new ErrorCode(1_002_042_009, "当前选择的有效时间已过期，请增加有效时间");
+    public static final ErrorCode INSERT_TOKEN_DATA_ERROR = new ErrorCode(1_002_042_010, "token新增失败，请重新尝试");
 
 
 
-    //=========== 资金管理 1-002-042-000 ============
-    public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_042_001, "当前组织无资金管理");
+    //=========== 资金管理 1-002-043-000 ============
+    public static final ErrorCode ORGAN_AMOUNT_NO_EXIST = new ErrorCode(1_002_043_001, "当前组织无资金管理");
 
 
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java

@@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.machine;
 
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageResult;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
 import com.cf.imes.module.system.service.machine.MachineService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -15,6 +16,8 @@ import java.util.List;
 import java.util.Map;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 /**
  * @author Beal
@@ -29,6 +32,7 @@ public class MachineAuthController {
 
 
     @PutMapping("insert-organ-auth")
+    @OperateLog(type = CREATE)
     @Operation(summary = "组织机台授权信息新增")
     @PreAuthorize("@ss.hasPermission('machine-auth::update')")
     public CommonResult<Boolean> authInsert(@RequestBody MachineOrgAuthReq vo) {
@@ -38,6 +42,7 @@ public class MachineAuthController {
 
     @PostMapping("update-organ-auth")
     @Operation(summary = "修改组织机台数量")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('machine-auth::update')")
     public CommonResult<Boolean> authUpdate(@RequestBody MachineOrgAuthReq vo) {
         return success(machineService.authUpdate(vo));

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java

@@ -9,12 +9,12 @@ import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
 import com.cf.imes.module.system.service.machine.MachineService;
-import com.cf.imes.module.system.service.machine.MachineTemplateService;
 import com.cf.imes.module.system.validation.machine.MachineTypeValid;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 
 @Tag(name = "管理后台 - 机台")
@@ -35,21 +37,18 @@ public class MachineController {
     @Resource
     private MachineService machineService;
 
-    @Resource
-    private MachineTemplateService machineTemplateService;
-
     @PutMapping("/create-cutting")
     @Operation(summary = "创建机台")
-    //@PreAuthorize("@ss.hasPermission('machine::create')")
-    @OperateLog(logArgs = false)
+//    @PreAuthorize("@ss.hasAnyPermissions('system:machine:create','system:machine:duplet')")
+    @OperateLog(logArgs = false,type = CREATE )
     public CommonResult<Long> createCutting(@Validated(CreateGroup.class) @RequestBody CuttingSaveReqVO createReqVO) throws JsonProcessingException {
         return success(machineService.createCutting(createReqVO));
     }
 
     @PostMapping("/update-cutting")
     @Operation(summary = "更新机台")
-    //@PreAuthorize("@ss.hasPermission('machine::update')")
-    @OperateLog(logArgs = false)
+//    @PreAuthorize("@ss.hasAnyPermissions('system:machine:update','system:machine:submit')")
+    @OperateLog(logArgs = false,type = UPDATE)
     public CommonResult<Boolean> update(@Validated(UpdateGroup.class) @RequestBody CuttingSaveReqVO updateReqVO) {
         machineService.updateCutting(updateReqVO);
         return success(true);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java

@@ -17,6 +17,8 @@ import java.util.List;
 import java.util.Map;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 /**
  * @author there
@@ -49,16 +51,16 @@ public class MachineTemplateController {
 
     @PutMapping("insert-template-machine")
     @Operation(summary = "新增机台模板配置")
-    @PreAuthorize("@ss.hasPermission('machine-template::create')")
-    @OperateLog(logArgs = false)
+    @PreAuthorize("@ss.hasAnyPermissions('machine-template::create','machine-template::duplet')")
+    @OperateLog(logArgs = false,type = CREATE)
     public CommonResult<Long> createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
         return success(machineTemplateService.createCuttingTemplate(reqVO));
     }
 
     @PostMapping("update-template-machine")
     @Operation(summary = "修改机台模板配置")
-    @PreAuthorize("@ss.hasPermission('machine-template::update')")
-    @OperateLog(logArgs = false)
+    @PreAuthorize("@ss.hasAnyPermissions('machine-template::update','baseConfig:machine:submit')")
+    @OperateLog(logArgs = false,type = UPDATE)
     public CommonResult<Boolean> updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) {
         return success(machineTemplateService.updateCuttingTemplate(reqVO));
     }
@@ -87,7 +89,8 @@ public class MachineTemplateController {
 
     @PutMapping("insert-template-machine-brand")
     @Operation(summary = "新增机台模板品牌")
-    @PreAuthorize("@ss.hasPermission('machine-template::create')")
+    @OperateLog(type = CREATE)
+    @PreAuthorize("@ss.hasPermission('machine-template::insert-brand')")
     public CommonResult<Boolean> createMachineTemplateBrand(@RequestBody MachineTemplateBrandReqVO reqVO) {
         machineTemplateService.createMachineTemplateBrand(reqVO);
         return success(true);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java

@@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.permission;
 import cn.hutool.core.collection.CollUtil;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
@@ -12,8 +13,8 @@ import com.cf.imes.module.system.controller.admin.permission.vo.permission.Permi
 import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleUserReqVO;
 import com.cf.imes.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO;
 import com.cf.imes.module.system.enums.ErrorCodeConstants;
-import com.cf.imes.module.system.service.permission.PermissionService;
 import com.cf.imes.module.system.service.organ.OrganService;
+import com.cf.imes.module.system.service.permission.PermissionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +28,7 @@ import java.util.Objects;
 import java.util.Set;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 /**
  * 权限 Controller，提供赋予用户、角色的权限的 API 接口
@@ -53,8 +55,8 @@ public class PermissionController {
     }
 
     @PostMapping("/assign-role-menu")
-    @Operation(summary = "赋予角色菜单")
-//    @PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')")
+    @Operation(summary = "修改角色的菜单权限")
+    @OperateLog(module="管理后台 - 权限",name = "修改角色的菜单权限",type = UPDATE)
     @PreAuthorize("@ss.hasAnyPermissions('system:permission:assign-role-menu','base:permission:assign-role-menu')")
     public CommonResult<Boolean> assignRoleMenu(@Validated @RequestBody PermissionAssignRoleMenuReqVO reqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java

@@ -2,18 +2,22 @@ package com.cf.imes.module.system.controller.admin.setting;
 
 
 import com.cf.imes.framework.common.pojo.CommonResult;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.system.controller.admin.setting.vo.PackageConfigReqVO;
 import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO;
 import com.cf.imes.module.system.service.setting.SettingService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 @Tag(name = "管理后台 - 系统打包配置")
 @RestController
@@ -29,6 +33,7 @@ public class SettingController {
 
     @PutMapping("/insert")
     @Operation(summary = "新增打包系统配置")
+    @OperateLog(module="管理后台 - 系统打包配置",name = "新增打包/预打包系统配置",type = CREATE)
     //@PreAuthorize("@ss.hasPermission('system:data-source:query')")
     public CommonResult<Long> insertSetting( @RequestBody PackageConfigReqVO reqVO ) {
 
@@ -41,7 +46,8 @@ public class SettingController {
 
     @PostMapping("/update")
     @Operation(summary = "更新打包系统配置")
-    //@PreAuthorize("@ss.hasPermission('system:data-source:query')")
+    @OperateLog(module="管理后台 - 系统打包配置",name = "更新打包/预打包系统配置",type = UPDATE)
+//    @PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-config','manage:pack:pre-pack-config')")
     public CommonResult<Long> updateSetting( @RequestBody PackageConfigReqVO reqVO ) {
 
         return success(settingService.updateSetting(reqVO));

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java

@@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.systemconfig;
 
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.system.controller.admin.systemconfig.vo.*;
 import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
 import com.cf.imes.module.system.service.systemconfig.SystemConfigService;
@@ -16,6 +17,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
+import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
 
 /**
  * 系统配置管理控制器
@@ -49,6 +51,7 @@ public class SystemConfigController {
 
     @PostMapping("/status")
     @Operation(summary = "修改系统配置状态")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
     public CommonResult<Boolean> updateConfigStatus(@Valid @RequestBody ConfigUpdateStatusReqVO reqVO){
         systemConfigService.updateStatus(reqVO);
@@ -57,6 +60,7 @@ public class SystemConfigController {
 
     @PostMapping("/sort")
     @Operation(summary = "修改系统配置的顺序")
+    @OperateLog(type = UPDATE)
     @PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
     public CommonResult<Boolean> updateConfigSort(@Valid @RequestBody List<ConfigUpdateSortReqVO> reqVO){
         systemConfigService.updateConfigSort(reqVO);
@@ -65,8 +69,8 @@ public class SystemConfigController {
 
 
     @PostMapping()
-    @Operation(summary = "修改系统配置")
-    @PreAuthorize("@ss.hasPermission('system:base-setting:setting')")
+    @Operation(summary = "新增/修改系统配置")
+//    @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:setting','system:base-setting:save','system:base-setting:copy')")
     public CommonResult<Boolean> modifySystemConfig(@Valid @RequestBody ConfigSaveReqVO reqVO) {
         systemConfigService.modifySystemConfig(reqVO);
         return success(true);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/tokenconfig/vo/TokenConfigPageReqVO.java

@@ -29,7 +29,7 @@ public class TokenConfigPageReqVO extends PageParam {
 
     @Schema(description = "时间范围", example = "[2022-07-01 ,2022-07-01]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] expiresTime;
+    private LocalDate[] timeType;
 
 
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/tokenconfig/TokenConfigMapper.java

@@ -9,6 +9,7 @@ import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -23,13 +24,13 @@ import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.ge
 public interface TokenConfigMapper extends BaseMapperX<TokenConfigDO> {
 
 
-    default PageResult<TokenConfigDO> selectConfigPage(TokenConfigPageReqVO pageReqVO) {
+    default PageResult<TokenConfigDO> selectConfigPage(TokenConfigPageReqVO pageReqVO, LocalDateTime[] localDateTimes) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<TokenConfigDO>()
                 .eq(TokenConfigDO::getOrganId,getUserOrganId())
                 .eq(TokenConfigDO::getDeleted,false)
                 .likeIfPresent(TokenConfigDO::getAppToken,pageReqVO.getAppToken())
                 .likeIfPresent(TokenConfigDO::getAppName,pageReqVO.getAppName())
-                .betweenIfPresent(TokenConfigDO::getExpiresTime,pageReqVO.getExpiresTime())
+                .betweenIfPresent(TokenConfigDO::getExpiresTime,localDateTimes)
                 .orderByDesc(TokenConfigDO::getId));
     }
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java

@@ -7,6 +7,7 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.util.Assert.AssertUtils;
 import com.cf.imes.framework.common.util.date.DateUtils;
+import com.cf.imes.framework.common.util.date.LocalDateTimeUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig;
 import com.cf.imes.module.system.controller.admin.tokenconfig.vo.TokenConfigPageReqVO;
@@ -32,10 +33,8 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.util.*;
 
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -66,7 +65,16 @@ public class TokenConfigServiceImpl implements TokenConfigService{
     @Override
     public PageResult<TokenConfigRespVO> getTokenConfigPage(TokenConfigPageReqVO pageReqVO) {
 
-        PageResult<TokenConfigDO> pageResult = tokenConfigMapper.selectConfigPage(pageReqVO);
+        LocalDateTime[] localDateTimes = new LocalDateTime[1];
+        if(pageReqVO.getTimeType() != null){
+            LocalDate[] expiresTime = pageReqVO.getTimeType();
+            localDateTimes = Arrays.stream(expiresTime)
+                    .map(date -> date.atTime(LocalTime.MIDNIGHT))
+                    .toArray(LocalDateTime[]::new);
+            localDateTimes = LocalDateTimeUtils.generateTimeSection(localDateTimes);
+        }
+
+        PageResult<TokenConfigDO> pageResult = tokenConfigMapper.selectConfigPage(pageReqVO,localDateTimes);
         if(CollUtil.isEmpty(pageResult.getList())) {
             return new PageResult<>();
         }