From d613501bcba7ab8f41f3001497e89b743c6c8a4b Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 16 Jan 2024 15:15:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E7=A6=BE=E4=BA=8C=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SupplierController.java | 11 --- .../goods/controller/ApplyController.java | 15 +++ .../goods/service/impl/GoodsServiceImpl.java | 2 +- .../src/main/resources/log-back.xml | 93 +++++++++++++++++++ .../lims/config/RedisToolConfig.java | 17 ++++ .../lims/mapper/LargeScreenMapper.xml | 8 +- .../service/impl/LargeScreenServiceImpl.java | 12 +-- .../lab-lims/src/main/resources/log-back.xml | 93 +++++++++++++++++++ .../system/user/config/RedissonConfig.java | 1 + 9 files changed, 230 insertions(+), 22 deletions(-) create mode 100644 lab-service/lab-capital/src/main/resources/log-back.xml create mode 100644 lab-service/lab-lims/src/main/resources/log-back.xml diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/SupplierController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/SupplierController.java index 0710ef9..2bd14ff 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/SupplierController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/SupplierController.java @@ -146,17 +146,6 @@ public class SupplierController extends BladeController { } } - // 重复提示 - Supplier byId = supplierService.getById(supplier.getId()); - if (!byId.getName().equals(supplier.getName())) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Supplier::getName, supplier.getName()); - List suppliers = supplierService.list(wrapper); - if (CollectionUtils.isNotEmpty(suppliers)) { - throw new Exception("该供应商已存在，请勿重复增加！"); - } - } - return R.status(supplierService.updateById(supplier)); } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index ac29aae..e22c82f 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -24,6 +26,8 @@ import org.springblade.lims.goods.service.IGoodsService; import org.springblade.lims.goods.vo.ApplyVO; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; +import org.springblade.system.cache.SysCache; +import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; @@ -31,6 +35,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.stream.Collectors; /** * 申请表 控制器 @@ -85,6 +90,16 @@ public class ApplyController extends BladeController { if (apply.getStartTime() != null && apply.getEndTime() != null) { wrapper.between(Apply::getCreateTime, apply.getStartTime(), apply.getEndTime()); } + List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); + if(!roles.contains("admin") && !roles.contains("政府")){ + List deptIds = new ArrayList<>(); + List depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId())); + if(CollectionUtils.isNotEmpty(depts)){ + deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList()); + } + deptIds.add(Long.parseLong(AuthUtil.getDeptId())); + wrapper.in(BaseEntity::getCreateDept,deptIds); + } // 按照时间倒序 wrapper.orderByDesc(Apply::getCreateTime); return applyService.page(Condition.getPage(query), wrapper); diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java index 5de8d85..772468d 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java @@ -55,7 +55,7 @@ public class GoodsServiceImpl extends BaseServiceImpl implem } catch (Exception e) { e.printStackTrace(); } - path = sysClient.getParamValue("jiahe_file_url").getData() + fileName; + //path = sysClient.getParamValue("jiahe_file_url").getData() + fileName; } map.put("filename",originalFilename); map.put("path",path); diff --git a/lab-service/lab-capital/src/main/resources/log-back.xml b/lab-service/lab-capital/src/main/resources/log-back.xml new file mode 100644 index 0000000..005873b --- /dev/null +++ b/lab-service/lab-capital/src/main/resources/log-back.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 30 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 30 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 2 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java index 5882480..0166ab5 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/config/RedisToolConfig.java @@ -3,18 +3,35 @@ package org.springblade.lims.config; import lombok.RequiredArgsConstructor; import org.springblade.lims.tools.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; @Configuration @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RedisToolConfig { + @Value("${spring.redis.host}") + private String host; + + @Value("${spring.redis.port}") + private int port; + + @Value("${spring.redis.password}") + private String password; + private final RedisTemplate redisTemplate; @Bean(name = "redisUtil") public RedisUtil redisUtil() { + RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration(host,port); + redisConfig.setPassword(password); + LettuceConnectionFactory factory = new LettuceConnectionFactory(redisConfig); + factory.afterPropertiesSet(); + redisTemplate.setConnectionFactory(factory); return new RedisUtil(redisTemplate); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/LargeScreenMapper.xml b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/LargeScreenMapper.xml index e31fd51..894608a 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/LargeScreenMapper.xml +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/LargeScreenMapper.xml @@ -42,7 +42,7 @@ GROUP BY - DATE_FORMAT( a.send_time, '%Y-%m-%d' ) + a.current_day SELECT - ROUND( sum( IFNULL( a.single_electricity, 0 )) * 0.997, 2 ) totalCarbonEmissions + ROUND( sum( IFNULL( a.single_electricity, 0 )) * 0.997/1000, 2 ) totalCarbonEmissions FROM t_instrument_data a @@ -368,7 +368,7 @@ SELECT a.manufacturer_brand, sum( ifnull(b.single_electricity,0) ) `sum`, - round(sum( ifnull(b.single_electricity,0) ) * 0.997,2) totalCarbonEmissions + round(sum( ifnull(b.single_electricity,0) ) * 0.997/1000,2) totalCarbonEmissions FROM t_instrument a LEFT JOIN t_instrument_data b ON a.`code` = b.imei @@ -410,7 +410,7 @@ SELECT current_month, ROUND(sum( - ifnull( single_electricity, 0 )) * 0.997,2) AS totalCarbonEmissions + ifnull( single_electricity, 0 )) * 0.997/1000,2) AS totalCarbonEmissions FROM t_instrument_data diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/LargeScreenServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/LargeScreenServiceImpl.java index d8e4177..6f7239c 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/LargeScreenServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/LargeScreenServiceImpl.java @@ -268,7 +268,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { if(CollectionUtils.isNotEmpty(instrumentList)){ for(Instrument instrument : instrumentList){ Map map = new HashMap<>(); - List> list1 = (List)redisUtil.get(instrument.getName() + "-runStatus"); + List> list1 = (List)redisUtil.get(instrument.getCode() + "-runStatus"); map.put("name",instrument.getName()); map.put("list",list1); list.add(map); @@ -312,7 +312,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { map.put("gffdzb",Double.parseDouble(String.format("%.2f",carbonEmissionPlan.getPvPower()/carbonEmissionPlan.getTotalCarbonReduction()*100))); map.put("gyyhzb",Double.parseDouble(String.format("%.2f",carbonEmissionPlan.getProcessOpt()/carbonEmissionPlan.getTotalCarbonReduction()*100))); map.put("sbghzb",Double.parseDouble(String.format("%.2f",carbonEmissionPlan.getEquipReplace()/carbonEmissionPlan.getTotalCarbonReduction()*100))); - map.put("ypfzb",Double.parseDouble(String.format("%.2f",carbonEmissionPlan.getTotalCarbonPlan()/largeScreenVO.getTotalCarbonEmissions()*100))); + map.put("ypfzb",Double.parseDouble(String.format("%.2f",largeScreenVO.getTotalCarbonEmissions()/carbonEmissionPlan.getTotalCarbonPlan()*100))); return map; } @@ -510,21 +510,21 @@ public class LargeScreenServiceImpl implements ILargeScreenService { if(CollectionUtils.isNotEmpty(instrumentList)){ for(Instrument instrument : instrumentList){ List> list = new ArrayList<>(); - if(redisUtil.get(instrument.getName() + "-runStatus") == null){ + if(redisUtil.get(instrument.getCode() + "-runStatus") == null){ list = new ArrayList<>(); Map map = new HashMap<>(); map.put("time",DateFormatUtils.format(date,"HH:mm")); map.put("runStatus",instrument.getRunStatus()==null?"2":instrument.getRunStatus().toString()); list.add(map); //早8点到晚8点，redis过期时间设置为4小时 - redisUtil.set(instrument.getName() + "-runStatus",list,60*60*4); + redisUtil.set(instrument.getCode() + "-runStatus",list,60*60*4); }else{ - list = (List)redisUtil.get(instrument.getName() + "-runStatus"); + list = (List)redisUtil.get(instrument.getCode() + "-runStatus"); Map map = new HashMap<>(); map.put("time",DateFormatUtils.format(date,"HH:mm")); map.put("runStatus",instrument.getRunStatus()==null?"2":instrument.getRunStatus().toString()); list.add(map); - redisUtil.set(instrument.getName() + "-runStatus",list,60*60*4); + redisUtil.set(instrument.getCode() + "-runStatus",list,60*60*4); } } } diff --git a/lab-service/lab-lims/src/main/resources/log-back.xml b/lab-service/lab-lims/src/main/resources/log-back.xml new file mode 100644 index 0000000..35d52da --- /dev/null +++ b/lab-service/lab-lims/src/main/resources/log-back.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 30 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 30 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 2 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java index 01ea3ea..fc37bc2 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/config/RedissonConfig.java @@ -33,6 +33,7 @@ public class RedissonConfig { .setAddress("redis://" + host + ":" + port) .setDatabase(0) .setPingConnectionInterval(2000); + config.useSingleServer().setPassword(password); config.setLockWatchdogTimeout(10000L); try{ return Redisson.create(config);