diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java index db2a8124..309d29e8 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java @@ -4,6 +4,7 @@ import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.tool.api.R; import org.springblade.resource.pojo.entity.Attach; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -17,7 +18,7 @@ public interface IAttachClient { String DETAIL = API_PREFIX + "/detail"; - String DETAIL_BY_ID = API_PREFIX + "/detailById"; + String DETAIL_BY_ID = API_PREFIX + "/detail-by-id"; /** * @@ -25,13 +26,13 @@ public interface IAttachClient { * @return */ @PostMapping(DETAIL) - public R detail(@RequestBody Attach attach); + R detail(@RequestBody Attach attach); /** - * + * todo:改成get * @param id * @return */ - @PostMapping(DETAIL_BY_ID) - public R detailById(@RequestParam("id") Long id); + @GetMapping(DETAIL_BY_ID) + R detailById(@RequestParam("id") Long id); } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java index 35d7146c..460ef125 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java @@ -17,7 +17,6 @@ public class AttachClient implements IAttachClient { private IAttachService attachService; @Override - @PostMapping(DETAIL) public R detail(Attach attach) { Attach detail = attachService.getOne(Condition.getQueryWrapper(attach)); return R.data(detail); diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml index 4d598302..dc4bcbbc 100644 --- a/blade-ops/blade-resource/src/main/resources/application.yml +++ b/blade-ops/blade-resource/src/main/resources/application.yml @@ -12,12 +12,24 @@ oss: #租户模式 tenant-mode: false #oss服务地址 - endpoint: http://192.168.0.220:9000 + # 本机- + endpoint: http://127.0.0.1:9000 + # 49腾讯云- + # endpoint: http://49.232.74.228:9000 #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址 - transform-endpoint: http://192.168.0.220:9000 + # 本机- + # transform-endpoint: http://192.168.0.220:9000 + # 49 tencent cloud- + transform-endpoint: http://49.232.74.228:9000 #访问key - access-key: T5PCRlMc5PxxubLCrVhR + # local- + # access-key: T5PCRlMc5PxxubLCrVhR + # 49 tencent cloud- + access-key: ozUrsZCh4SVxIkfXAyp4 #密钥key - secret-key: mbIbJKpTWulCdcsalKjoxaFJ8UDapGSU6Zw9QKjz + # local- + #secret-key: mbIbJKpTWulCdcsalKjoxaFJ8UDapGSU6Zw9QKjz + # 49 tencent cloud- + secret-key: uuk7LoVscPwPlB6jQUcLHNAdpupNavA1DDiI3n6r #存储桶 bucket-name: bladex diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java index ab84e8f8..4f7ed3f0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.TeamSetExcel; +import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; @@ -19,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-16 */ -public interface TeamSetMapper extends BaseMapper { +public interface TeamSetMapper extends EnBaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java index 583ab8b0..929c58c6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.WorkCenterExcel; +import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; @@ -19,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-16 */ -public interface WorkCenterMapper extends BaseMapper { +public interface WorkCenterMapper extends EnBaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java new file mode 100644 index 00000000..11811aa2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java @@ -0,0 +1,13 @@ +package org.springblade.desk.basic.mapper.en; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.core.mp.base.BaseEntity; + +/** + * Enhance MyBatis Plus BaseMapper. + * + * @param + */ +public interface EnBaseMapper extends BaseMapper { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java similarity index 78% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java index a2441b0e..39570a64 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java @@ -1,4 +1,4 @@ -package org.springblade.desk.quality.service; +package org.springblade.desk.basic.service; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java similarity index 78% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java index 520e906e..57d9b36c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ExBaseServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java @@ -1,8 +1,9 @@ -package org.springblade.desk.quality.service; +package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.service.ExBaseService; /** * 扩展框架中的BaseServiceImpl. diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java index 57f1cab9..830d9d08 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java @@ -1,6 +1,7 @@ package org.springblade.desk.basic.util; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import org.apache.commons.lang3.StringUtils; import org.springblade.desk.basic.constant.BaseRequest; @@ -94,4 +95,32 @@ public class RequestUtil { Date date = DateUtil.parse((String) map.get(key), PATTERN_DATE); return DateUtil.endOfDay(date); } + + /** + * + * @param map + * @param key + * @return 年月日 一天 开始的 LocalDateTime + */ + public static LocalDateTime buildLocalDateTimeBeginOfDay(final Map map, final String key) { + if (map == null || map.isEmpty() || StringUtils.isBlank(key) || !map.containsKey(key)) { + return null; + } + LocalDateTime localDateTime = LocalDateTimeUtil.parse((String) map.get(key), PATTERN_DATE); + return LocalDateTimeUtil.beginOfDay(localDateTime); + } + + /** + * + * @param map + * @param key + * @return 年月日 一天 结束的 LocalDateTime + */ + public static LocalDateTime buildLocalDateTimeEndOfDay(final Map map, final String key) { + if (map == null || map.isEmpty() || StringUtils.isBlank(key) || !map.containsKey(key)) { + return null; + } + LocalDateTime localDateTime = LocalDateTimeUtil.parse((String) map.get(key), PATTERN_DATE); + return LocalDateTimeUtil.endOfDay(localDateTime); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index 6c7231b7..e286263e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -94,20 +94,20 @@ public class InspectionTemplateController extends BladeController { // QueryWrapper qw = Condition.getQueryWrapper(map, InspectionTemplate.class); InspectionTemplateSearch search = new InspectionTemplateSearch(); - if (map.containsKey("inspectionTemplateCode")) { - search.setInspectionTemplateCode((String) map.get("inspectionTemplateCode")); + if (map.containsKey(InspectionTemplate.COL_INSPECTION_TEMPLATE_CODE)) { + search.setInspectionTemplateCode((String) map.get(InspectionTemplate.COL_INSPECTION_TEMPLATE_CODE)); } - if (map.containsKey("name")) { - search.setName((String) map.get("name")); + if (map.containsKey(InspectionTemplate.COL_NAME)) { + search.setName((String) map.get(InspectionTemplate.COL_NAME)); } if (map.containsKey("processNum")) { search.setProcessNum(Integer.parseInt((String) map.get("processNum"))); } - if (map.containsKey("updateUserRealName")) { - search.setUpdateUserRealName((String) map.get("updateUserRealName")); + if (map.containsKey(BaseRequest.UP_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); } - if (map.containsKey("category")) { - search.setCategory((String) map.get("category")); + if (map.containsKey(InspectionTemplate.COL_CATEGORY)) { + search.setCategory((String) map.get(InspectionTemplate.COL_CATEGORY)); } if (map.containsKey(BaseRequest.UP_REAL_NAME)) { search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 939a9b09..7d000f29 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -86,9 +86,9 @@ public class LiquidTankTaskCopyController extends BladeController { log.warn("key = {}, value = {}, type = {}", key, value, value.getClass()); } ); + // 范围日期 Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); - // 范围日期 QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); @@ -96,6 +96,7 @@ public class LiquidTankTaskCopyController extends BladeController { if (crStart != null && crEnd != null) { qw.between(BaseCol.CREATE_TIME, crStart, crEnd); } + qw.orderByDesc(BaseCol.ID); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = LiquidTankTaskCopyWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java index 6bbc1d6f..990376d6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java @@ -141,7 +141,7 @@ public class CycleTestItemService2 { } public void setVOValue(CycleTestItemVO vo) { - CycleTestStandard standard = standardService.getByIdIgnoreLogicDelete(vo.getCycleTestStandardId()); + CycleTestStandard standard = standardService.getById(vo.getCycleTestStandardId()); if (standard != null) { vo.setCycleTestStandardName(standard.getName()); Attach attach = attachClient.detailById(standard.getStandardAttachId()).getData(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java index 5e17a6a6..3ef72175 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java @@ -61,10 +61,10 @@ public class CycleTestStandardService2 { } public void setVOValue(CycleTestStandardVO vo) { - Attach a = attachClient.detailById(vo.getStandardAttachId()).getData(); - if (a != null) { - vo.setOriginalName(a.getOriginalName()); - vo.setLink(a.getLink()); + Attach attach = attachClient.detailById(vo.getStandardAttachId()).getData(); + if (attach != null) { + vo.setOriginalName(attach.getOriginalName()); + vo.setLink(attach.getLink()); } } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java index 9c80a282..4b147556 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java @@ -65,6 +65,7 @@ public class CycleTestStandardServiceImpl extends BaseServiceImpl qw = new QueryWrapper<>(); qw.eq(BaseCol.ID, id); qw.eq(BaseCol.IS_DELETED, null); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/StandardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/StandardServiceImpl.java index 640ba5f3..0fded3c3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/StandardServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/StandardServiceImpl.java @@ -59,9 +59,9 @@ public class StandardServiceImpl extends BaseServiceImpl r = attachClient.detailById(vo.getStandardAttachId()); - if (!Objects.isNull(r.getData())) { - vo.setAttach(r.getData()); + R attach = attachClient.detailById(vo.getStandardAttachId()); + if (!Objects.isNull(attach.getData())) { + vo.setAttach(attach.getData()); } } } diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml index 7283250d..ee944c91 100644 --- a/blade-service/blade-desk/src/main/resources/application-dev.yml +++ b/blade-service/blade-desk/src/main/resources/application-dev.yml @@ -21,6 +21,8 @@ business: #角色配置 role-config: #工艺员角色id - process-engineer-id: "1993624442365915137" + # process-engineer-id: "2004331529923555330" + # 49 tencent cloud + process-engineer-id: "2004331529923555330" #工艺员角色alias process-engineer-alias: "process_engineer" \ No newline at end of file diff --git a/blade-service/blade-system/src/main/resources/application-dev.yml b/blade-service/blade-system/src/main/resources/application-dev.yml index c49884a7..9f4c7f3a 100644 --- a/blade-service/blade-system/src/main/resources/application-dev.yml +++ b/blade-service/blade-system/src/main/resources/application-dev.yml @@ -12,6 +12,8 @@ spring: #角色配置 role-config: #工艺员角色id - process-engineer-id: "1993624442365915137" + # process-engineer-id: "2004331529923555330" + # 49 tencent cloud + process-engineer-id: "2004331529923555330" #工艺员角色alias process-engineer-alias: "process_engineer" \ No newline at end of file