Commit 6605ae34 by zhangmengqi

Merge branch 'dev'

parents 007b0708 234106b2
...@@ -4,9 +4,6 @@ import net.jodah.expiringmap.ExpirationPolicy; ...@@ -4,9 +4,6 @@ import net.jodah.expiringmap.ExpirationPolicy;
import net.jodah.expiringmap.ExpiringMap; import net.jodah.expiringmap.ExpiringMap;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.sql.Connection;
import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Component @Component
public class InitBalanceMap implements InitializingBean { public class InitBalanceMap implements InitializingBean {
......
package com.patzn.cloud.service.lims.rcp; package com.patzn.cloud.service.lims.rcp;
import com.patzn.cloud.service.lims.socket.ServerConfig;
import com.patzn.cloud.service.lims.socket.SocketProperties; import com.patzn.cloud.service.lims.socket.SocketProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.ServerSocket; import java.util.concurrent.ExecutorService;
import java.net.Socket;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@Component @Component
public class Runner implements CommandLineRunner { public class Runner implements InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(Runner.class);
@Autowired @Autowired
private SocketProperties properties; private SocketProperties properties;
@Autowired
@Qualifier(value = "crawlExecutorPool")
private ExecutorService pool;
@Override @Override
public void run(String... args) throws Exception { public void afterPropertiesSet() {
System.out.println("设备服务器已经开启, 监听端口:" + properties.getPort()); pool.execute(() -> {
new NettyServer().bind(6800); try {
// ThreadPoolExecutor pool = new ThreadPoolExecutor( try {
// properties.getPoolCore(), System.out.println("设备服务器已经开启, 监听端口:6800");
// properties.getPoolMax(), new NettyServer().bind(6800);
// properties.getPoolKeep(), logger.error("SOCKET 端口 启动Success");
// TimeUnit.SECONDS, }catch (Exception e){
// new ArrayBlockingQueue<>(properties.getPoolQueueInit()), logger.error("SOCKET 端口 启动失败"+e.getMessage());
// new ThreadPoolExecutor.DiscardOldestPolicy() }
// ); } catch (Exception e) {
e.printStackTrace();
}
System.out.println(Thread.currentThread().getName() + "======定时任务执行完成======");
});
} }
} }
...@@ -32,6 +32,8 @@ public class ServerHandler extends ChannelInboundHandlerAdapter { ...@@ -32,6 +32,8 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
System.out.println(); System.out.println();
logger.error("目前天平库的信息为:"+mapValue.toString());
System.out.println("接收到客户端信息:" + request.toString()); System.out.println("接收到客户端信息:" + request.toString());
//返回的数据结构 //返回的数据结构
RpcResponse response = new RpcResponse(); RpcResponse response = new RpcResponse();
......
package com.patzn.cloud.service.lims.rcp;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Component
@Configuration
public class ThreadPush {
@Bean(name = "crawlExecutorPool")
public ExecutorService crawlExecutorPool() {
// 获取Java虚拟机的可用的处理器数,最佳线程个数,处理器数*2。根据实际情况调整
int curSystemThreads = Runtime.getRuntime().availableProcessors() * 2;
System.out.println("------------系统可用线程池个数:" + curSystemThreads);
// 创建线程池
ExecutorService pool = Executors.newFixedThreadPool(curSystemThreads);
return pool;
}
}
package com.patzn.cloud.service.lims.soil.service.impl; package com.patzn.cloud.service.lims.soil.service.impl;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
...@@ -19,12 +17,10 @@ import com.patzn.cloud.commons.toolkit.DateUtils; ...@@ -19,12 +17,10 @@ import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.FileUtils; import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.feign.base.client.SysOrgClient; import com.patzn.cloud.feign.base.client.SysOrgClient;
import com.patzn.cloud.feign.base.client.SysUserClient; import com.patzn.cloud.feign.base.client.SysUserClient;
import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
import com.patzn.cloud.feign.lims.base.client.LmsUserRelGroupClient; import com.patzn.cloud.feign.lims.base.client.LmsUserRelGroupClient;
import com.patzn.cloud.oss.starter.OssClient; import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult; import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.base.entity.SysFileSignature; import com.patzn.cloud.service.base.entity.SysFileSignature;
import com.patzn.cloud.service.base.entity.SysUser;
import com.patzn.cloud.service.lims.base.entity.LmsUserRelGroup; import com.patzn.cloud.service.lims.base.entity.LmsUserRelGroup;
import com.patzn.cloud.service.lims.base.vo.LmsUserRelGroupVO; import com.patzn.cloud.service.lims.base.vo.LmsUserRelGroupVO;
import com.patzn.cloud.service.lims.collect.core.CollectDataType; import com.patzn.cloud.service.lims.collect.core.CollectDataType;
...@@ -32,8 +28,6 @@ import com.patzn.cloud.service.lims.common.*; ...@@ -32,8 +28,6 @@ import com.patzn.cloud.service.lims.common.*;
import com.patzn.cloud.service.lims.common.service.IExportService; import com.patzn.cloud.service.lims.common.service.IExportService;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService; import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
import com.patzn.cloud.service.lims.soil.service.*; import com.patzn.cloud.service.lims.soil.service.*;
import com.patzn.cloud.service.llgt.entity.ManufactWarrantiesRelSample;
import com.patzn.cloud.service.meter.entity.MeterEntrust;
import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO; import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO;
import com.patzn.cloud.service.soil.entity.*; import com.patzn.cloud.service.soil.entity.*;
import com.patzn.cloud.service.lims.soil.mapper.SoilExperimentMapper; import com.patzn.cloud.service.lims.soil.mapper.SoilExperimentMapper;
...@@ -46,16 +40,10 @@ import com.patzn.cloud.service.soil.vo.*; ...@@ -46,16 +40,10 @@ import com.patzn.cloud.service.soil.vo.*;
import jcifs.smb.SmbFile; import jcifs.smb.SmbFile;
import net.coobird.thumbnailator.Thumbnails; import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.charts.LegendPosition;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xddf.usermodel.chart.AxisPosition;
import org.apache.poi.xssf.usermodel.*; import org.apache.poi.xssf.usermodel.*;
import org.apache.poi.xssf.usermodel.charts.XSSFChartLegend;
import org.apache.poi.xssf.usermodel.charts.XSSFValueAxis;
import org.openxmlformats.schemas.drawingml.x2006.chart.*; import org.openxmlformats.schemas.drawingml.x2006.chart.*;
import org.openxmlformats.schemas.drawingml.x2006.main.*; import org.openxmlformats.schemas.drawingml.x2006.main.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -1255,7 +1243,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1255,7 +1243,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
} }
FileOutputStream os = null; FileOutputStream os = null;
File file = null; File file = null;
String generated="原始记录"; String generated="ORIGINAL";
try { try {
file = File.createTempFile(generated, "."+template.getType()); file = File.createTempFile(generated, "."+template.getType());
......
server:
exception:
to: 929339256@qq.com;1516330897@qq.com;18463106881@163.com
subject: docker测试 soil 服务异常
service:
api-url: http://api.docker.com
url: http://api.docker.com
food-url: http://food.docker.com
province-item-url: http://60.216.97.250:8087
soffice: /opt/libreoffice6.1/program/soffice
spring:
mail:
host: smtp.qq.com
password: amevchrqenqweebg
default-encoding: UTF-8
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
username: 1781849245@qq.com
port: 465
protocol: smtps
datasource:
username: dbdocker
password: 123456aa
url: jdbc:postgresql://db:5432/pc_lims_soil
driver-class-name: org.postgresql.Driver
dynamic:
enabled: false
# 注册中心配置
cloud:
consul:
host: consul
rabbitmq:
host: rabbitmq
port: 5672
username: patzndocker
password: docker456!
virtual-host: /
topic:
push-msg: pro.topic.push.msg
sys-log: pro.topic.sys.log
chemical-classify-warning: pro.topic.chemical.classify.warning
equip-check-msg: pro.topic.equip.check.msg
report-make-msg: pro.topic.report.make.msg
soil-work-msg: pro.topic.soil.work.msg
redis:
host: redis
password: ptdockerAa
# Mongodb GridFS
data:
mongodb:
uri: mongodb://mgluser:mgldocker@mongodb:27017/lims
grid-fs-database: lims
# Mongodb GridFS 存储
oss:
grid-fs: true
bucket-name: base
### jobs
jobs:
admin-address: http://api.docker.com/print
# 日志
logging:
config: classpath:log4j2-pro.xml
ALTER TABLE "public"."soil_exp_report"
ALTER TABLE "public"."soil_exp_report"
ADD COLUMN "appendix_key" varchar(255);
COMMENT ON COLUMN "public"."soil_exp_report"."appendix_key" IS '附录KEY';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment