From 9ac149efc825b9237d5e483d63dd15604f0bc30b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:32 +0800
Subject: [PATCH] 1、切割识别界面提供原片尺寸。 2、fixbug：当工程下的版图切割完毕后，界面显示工程号+最大版序+1bug 3、系统参数配置：新增系统参数配置，存入redis，方便后续各个模块调用。后续工作：将各个模块的配置参数由配置文件调整为数据库记录。
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/impl/SysConfigServiceImpl.java | 65 ++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/SysConfig.java | 61 ++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/controller/SysConfigController.java | 61 ++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/mapper/SysConfigMapper.java | 15 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 23 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/SysConfigService.java | 29 ++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/request/SysConfigRequest.java | 42 +++++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/RedisConfig.java | 22 +++
9 files changed, 314 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/controller/SysConfigController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/controller/SysConfigController.java
new file mode 100644
index 0000000..de75cd1
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/controller/SysConfigController.java
@@ -0,0 +1,61 @@
+package com.mes.sysconfig.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.sysconfig.entity.SysConfig;
+import com.mes.sysconfig.entity.request.SysConfigRequest;
+import com.mes.sysconfig.service.SysConfigService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * (SysConfig)琛ㄦ帶鍒跺眰
+ *
+ * @author makejava
+ * @since 2025-04-01 15:01:15
+ */
+@Api(tags = "绯荤粺閰嶇疆")
+@RestController
+@RequestMapping("/sys/sysConfig")
+public class SysConfigController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private SysConfigService sysConfigService;
+
+ @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
+ @PostMapping("/queryConfigPage")
+ public Result<Page<SysConfig>> queryConfigPage(@RequestBody SysConfigRequest request) {
+ return Result.success(sysConfigService.queryConfigPage(request));
+ }
+
+ @ApiOperation("绯荤粺閰嶇疆鏌ヨ閫氳繃id")
+ @GetMapping("/queryConfigById")
+ public Result<SysConfig> queryConfigById(Long id) {
+ return Result.success(sysConfigService.queryConfigById(id));
+ }
+
+ @ApiOperation("淇濆瓨绯荤粺閰嶇疆")
+ @PostMapping("/saveConfig")
+ public Result<SysConfig> saveConfig(@RequestBody SysConfig request) {
+ return Result.success(sysConfigService.saveConfig(request));
+ }
+
+ @ApiOperation("淇敼绯荤粺閰嶇疆")
+ @PostMapping("/updateConfig")
+ public Result<SysConfig> updateConfig(@RequestBody SysConfig request) {
+ return Result.success(sysConfigService.updateConfig(request));
+ }
+
+ @ApiOperation("鍒犻櫎绯荤粺閰嶇疆")
+ @GetMapping("/deleteConfig")
+ public Result<Boolean> deleteConfig(Long id) {
+ return Result.success(sysConfigService.deleteConfig(id));
+ }
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/SysConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/SysConfig.java
new file mode 100644
index 0000000..f39bbeb
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/SysConfig.java
@@ -0,0 +1,61 @@
+package com.mes.sysconfig.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * (SysConfig)琛ㄥ疄浣撶被
+ *
+ * @author makejava
+ * @since 2025-04-01 15:01:22
+ */
+@ApiModel(description = "(SysConfig)琛ㄥ疄浣撶被")
+@Data
+public class SysConfig {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 鐖堕厤缃甶d(寮冪敤)
+ */
+ @ApiModelProperty(value = "鐖堕厤缃甶d(寮冪敤)", position = 2)
+ private Long parentId;
+ /**
+ * 閰嶇疆鍚�
+ */
+ @ApiModelProperty(value = "閰嶇疆鍚�", position = 3)
+ private String configName;
+ /**
+ * 閰嶇疆浠ｇ爜
+ */
+ @ApiModelProperty(value = "閰嶇疆浠ｇ爜", position = 4)
+ private String configCode;
+ /**
+ * 閰嶇疆鍊�
+ */
+ @ApiModelProperty(value = "閰嶇疆鍊�", position = 5)
+ private String configValue;
+ /**
+ * 鏄惁鍚敤
+ */
+ @ApiModelProperty(value = "鏄惁鍚敤", position = 6)
+ private Integer isEnable;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 7)
+ private Date createTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 8)
+ private Date updateTime;
+
+
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/request/SysConfigRequest.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/request/SysConfigRequest.java
new file mode 100644
index 0000000..48f31b6
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/entity/request/SysConfigRequest.java
@@ -0,0 +1,42 @@
+package com.mes.sysconfig.entity.request;
+
+import com.mes.base.entity.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/4/1 15:09
+ * @Description:
+ */
+@ApiModel(description = ":")
+@Data
+public class SysConfigRequest extends PageRequest {
+
+ private Integer id;
+ /**
+ * 鐖堕厤缃甶d(寮冪敤)
+ */
+ private Integer parentId;
+ /**
+ * 閰嶇疆鍚�
+ */
+ @ApiModelProperty(value = "閰嶇疆鍚�", position = 3)
+ private String configName;
+ /**
+ * 閰嶇疆浠ｇ爜
+ */
+ @ApiModelProperty(value = "閰嶇疆浠ｇ爜", position = 4)
+ private String configCode;
+ /**
+ * 閰嶇疆鍊�
+ */
+ @ApiModelProperty(value = "閰嶇疆鍊�", position = 5)
+ private String configValue;
+ /**
+ * 鏄惁鍚敤
+ */
+ @ApiModelProperty(value = "鏄惁鍚敤", position = 6)
+ private Integer isEnable;
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/mapper/SysConfigMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/mapper/SysConfigMapper.java
new file mode 100644
index 0000000..004d24b
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/mapper/SysConfigMapper.java
@@ -0,0 +1,15 @@
+package com.mes.sysconfig.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.sysconfig.entity.SysConfig;
+
+/**
+ * (SysConfig)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2025-04-01 15:01:18
+ */
+public interface SysConfigMapper extends BaseMapper<SysConfig> {
+
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/SysConfigService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/SysConfigService.java
new file mode 100644
index 0000000..590be9a
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/SysConfigService.java
@@ -0,0 +1,29 @@
+package com.mes.sysconfig.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.sysconfig.entity.SysConfig;
+import com.mes.sysconfig.entity.request.SysConfigRequest;
+
+import java.io.Serializable;
+
+/**
+ * (SysConfig)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author makejava
+ * @since 2025-04-01 15:01:26
+ */
+public interface SysConfigService extends IService<SysConfig> {
+
+ Page<SysConfig> queryConfigPage(SysConfigRequest request);
+
+ SysConfig queryConfigById(Serializable id);
+
+ SysConfig saveConfig(SysConfig request);
+
+ SysConfig updateConfig(SysConfig request);
+
+ Boolean deleteConfig(Serializable id);
+
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/impl/SysConfigServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/impl/SysConfigServiceImpl.java
new file mode 100644
index 0000000..0617a52
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/sysconfig/service/impl/SysConfigServiceImpl.java
@@ -0,0 +1,65 @@
+package com.mes.sysconfig.service.impl;
+
+import cn.smallbun.screw.core.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.sysconfig.entity.SysConfig;
+import com.mes.sysconfig.entity.request.SysConfigRequest;
+import com.mes.sysconfig.mapper.SysConfigMapper;
+import com.mes.sysconfig.service.SysConfigService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+
+/**
+ * (SysConfig)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author makejava
+ * @since 2025-04-01 15:01:27
+ */
+@Service
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements SysConfigService {
+
+ @Override
+ public Page<SysConfig> queryConfigPage(SysConfigRequest request) {
+ Page<SysConfig> page = new Page<>(request.getPageNo(), request.getPageSize());
+ LambdaQueryWrapper<SysConfig> wrapper = new LambdaQueryWrapper<SysConfig>()
+ .like(StringUtils.isNotBlank(request.getConfigName()), SysConfig::getConfigName, request.getConfigName())
+ .like(StringUtils.isNotBlank(request.getConfigCode()), SysConfig::getConfigCode, request.getConfigCode())
+ .like(StringUtils.isNotBlank(request.getConfigValue()), SysConfig::getConfigValue, request.getConfigValue())
+ .eq(request.getIsEnable() != -1, SysConfig::getIsEnable, request.getIsEnable())
+ .orderByAsc(SysConfig::getId);
+ return this.page(page, wrapper);
+ }
+
+ @Override
+ @Cacheable(value = "sysConfig", key = "#id")
+ public SysConfig queryConfigById(Serializable id) {
+ return this.getById(id);
+ }
+
+ @Override
+ @CachePut(value = "sysConfig", key = "#request.id")
+ public SysConfig saveConfig(SysConfig request) {
+ this.save(request);
+ return request;
+ }
+
+ @Override
+ @CachePut(value = "sysConfig", key = "#request.id")
+ public SysConfig updateConfig(SysConfig request) {
+ this.updateById(request);
+ return request;
+ }
+
+ @Override
+ @CacheEvict(value = "sysConfig", key = "#id")
+ public Boolean deleteConfig(Serializable id) {
+ return this.removeById(id);
+ }
+}
+
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/RedisConfig.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/RedisConfig.java
index e469272..f03aec7 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/RedisConfig.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/RedisConfig.java
@@ -1,10 +1,17 @@
package com.mes.common.config;
+
import com.mes.common.utils.FastJsonRedisSerializer;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
@@ -13,6 +20,7 @@
* @Description:
*/
@Configuration
+@EnableCaching
public class RedisConfig {
@Bean
@@ -34,4 +42,18 @@
template.afterPropertiesSet();
return template;
}
+
+
+ @Bean
+ public CacheManager cacheManager(RedisConnectionFactory factory) {
+ RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+ .disableCachingNullValues()
+ .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
+
+ RedisCacheManager redisCacheManager = RedisCacheManager.builder(factory)
+ .cacheDefaults(redisCacheConfiguration)
+ .build();
+
+ return redisCacheManager;
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 78ec958..a001af5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -11,10 +11,9 @@
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.damage.entity.Damage;
-import com.mes.damage.mapper.DamageMapper;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
-import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -33,6 +32,8 @@
import com.mes.pp.mapper.OptimizeHeatDetailMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +76,9 @@
@Autowired
DamageService damageService;
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
+
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
@@ -108,10 +112,16 @@
}
}
JSONObject jsonObject = new JSONObject();
- List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
jsonObject.append("currentCutTerritory", currentCutDrawings);
- jsonObject.append("engineer", engineering.getEngineerId());
- jsonObject.append("sequence", patternSequence);
+ if (CollectionUtil.isNotEmpty(currentCutDrawings)) {
+ jsonObject.append("engineer", engineering.getEngineerId());
+ jsonObject.append("sequence", patternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>()
+ .eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId())
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ jsonObject.append("upPattenUsage", upPattenUsage);
+ }
return jsonObject;
}
@@ -122,6 +132,9 @@
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, engineerId));
long totalPatternSequence = glassInfoList.stream().map(GlassInfo::getPatternSequence).distinct().count();
map.put("totalPatternSequence", totalPatternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId)
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ map.put("upPattenUsage", upPattenUsage);
return map;
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index dfdb024..588bda2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -11,7 +11,6 @@
import com.mes.pp.service.OptimizeProjectService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
-import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
@@ -24,7 +23,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -139,7 +137,7 @@
loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
}
- @Scheduled(fixedDelay = 10)
+ @Scheduled(fixedDelay = 10000)
public void loadTwoGlass() {
loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
}
--
Gitblit v1.8.0