DeXun/industry
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大规模优化

Browse Source
This commit is contained in:
hdka
2024-12-25 18:08:41 +08:00
parent 8187160185
commit b8793b7621
13 changed files with 295 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
industry-admin/src/main/java/com/industry/web/controller/work/IndustryBatchController.java
View File

@@ -48,22 +48,6 @@ public class IndustryBatchController extends BaseController
return getDataTable(list);
}
/**
* 导出批次总表列表
@PreAuthorize("@ss.hasPermi('work:batch:export')")
@Log(title = "批次总表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IndustryBatch industryBatch)
{
List<IndustryBatch> list = industryBatchService.selectIndustryBatchList(industryBatch);
ExcelUtil<IndustryBatch> util = new ExcelUtil<IndustryBatch>(IndustryBatch.class);
util.exportExcel(response, list, "批次总表数据");
}
*/
/**
* 获取批次总表详细信息
*/

14
industry-admin/src/main/java/com/industry/web/controller/work/IndustryFaultController.java
View File

@@ -49,20 +49,6 @@ public class IndustryFaultController extends BaseController
return getDataTable(list);
}
/**
* 导出故障管理列表
@PreAuthorize("@ss.hasPermi('system:fault:export')")
@Log(title = "故障管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IndustryFault industryFault)
{
List<IndustryFault> list = industryFaultService.selectIndustryFaultList(industryFault);
ExcelUtil<IndustryFault> util = new ExcelUtil<IndustryFault>(IndustryFault.class);
util.exportExcel(response, list, "故障管理数据");
}
*/
/**
* 获取故障管理详细信息
*/

34
industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java
View File

@@ -71,7 +71,6 @@ public class IndustryMaterialController extends BaseController
/**
* 查询钽靶主类列表
*/
//@PreAuthorize("@ss.hasPermi('system:material:list')")
@GetMapping("/list")
public TableDataInfo list(IndustryMaterial industryMaterial)
{
@@ -82,9 +81,8 @@ public class IndustryMaterialController extends BaseController
/**
* 查询钽靶主类列表
* 查询钽靶主类列表，和上述接口差在只会查单一状态的列表
*/
//@PreAuthorize("@ss.hasPermi('system:material:list')")
@GetMapping("/list1")
public TableDataInfo list1(IndustryMaterial industryMaterial)
{
@@ -117,23 +115,6 @@ public class IndustryMaterialController extends BaseController
List<IndustryMaterialVo> list = industryMaterialService.selectAbnormalList(industryMaterial);
return getDataTable(list);
}
/**
* 导出钽靶主类列表
@PreAuthorize("@ss.hasPermi('system:material:export')")
@Log(title = "钽靶主类", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IndustryMaterial industryMaterial)
{
List<IndustryMaterial> list = industryMaterialService.selectIndustryMaterialList(industryMaterial);
ExcelUtil<IndustryMaterial> util = new ExcelUtil<IndustryMaterial>(IndustryMaterial.class);
util.exportExcel(response, list, "钽靶主类数据");
}
*/
/**
* 获取钽靶主类详细信息
*/
@@ -194,7 +175,6 @@ public class IndustryMaterialController extends BaseController
IndustryStep industryStep = new IndustryStep();
industryStep.setStep(1L);
industryStep.setDelFlag(0L);
industryStepService.start(industryStep);
return success(industryMaterialService.start(industryMaterial));
}
@@ -280,19 +260,23 @@ public class IndustryMaterialController extends BaseController
@GetMapping("/nextStepFlag")
public AjaxResult nextStepFlag(){
Long flag = redisCache.getCacheObject("nextStepFlag");
if (flag==0L){
if (Objects.nonNull(flag) && flag==0L){
return AjaxResult.success(0);
}else{
return AjaxResult.success(1);
}
return AjaxResult.success(1);
}
@GetMapping("/nextStepFlagError")
public AjaxResult nextStepFlagError(){
Long flag = redisCache.getCacheObject("nextStepFlagError");
if (flag==0L){
if (Objects.nonNull(flag) && flag==0L){
return AjaxResult.success(0);
}else{
return AjaxResult.success(1);
}
return AjaxResult.success(1);
}
@GetMapping("/clear")

14
industry-admin/src/main/java/com/industry/web/controller/work/IndustryStepController.java
View File

@@ -62,20 +62,6 @@ public class IndustryStepController extends BaseController
return AjaxResult.success(list);
}
/**
* 导出钽靶道次表列表
@PreAuthorize("@ss.hasPermi('system:step:export')")
@Log(title = "钽靶道次表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, IndustryStep industryStep)
{
List<IndustryStep> list = industryStepService.selectIndustryStepList(industryStep);
ExcelUtil<IndustryStep> util = new ExcelUtil<IndustryStep>(IndustryStep.class);
util.exportExcel(response, list, "钽靶道次表数据");
}
*/
/**
* 获取钽靶道次表详细信息
*/

8
industry-admin/src/main/resources/application-druid.yml
View File

@@ -6,16 +6,16 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/industry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://49.233.157.185:3306/industry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
password: WANGyu11!
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url: jdbc:mysql://localhost:3306/industry2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://49.233.157.185:3306/industry2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
password: WANGyu11!
# 初始连接数
initialSize: 5
# 最小连接池数量

12
industry-admin/src/main/resources/application.yml
View File

@@ -37,8 +37,8 @@ server:
# 日志配置
logging:
level:
com.industry: error
org.springframework: error
com.industry: debug
org.springframework: debug
# 用户配置
user:
@@ -71,13 +71,13 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 49.233.157.185
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
password:
password: WANGyu11!
# 连接超时时间
timeout: 10000
lettuce:
@@ -92,11 +92,11 @@ spring:
max-wait: -1
redis2:
# 地址
host: localhost
host: 49.233.157.185
# 端口号
port: 6379
# 密码
password:
password: WANGyu11!
# 连接超时时间
timeout: 10000
# 数据库索引