Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
b17b6cd0 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 fa509430 c9fc335e
内嵌 并排
正在显示 6 个修改的文件 包含 19 行增加 和 36 行删除
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
...@@ -206,7 +206,7 @@ public class OperationReportServiceImpl implements IOperationReportService { ...@@ -206,7 +206,7 @@ public class OperationReportServiceImpl implements IOperationReportService {
206 // 2: 隐患排查巡检:取风险点巡检记录里面巡检类型是生产巡检的数据 206 // 2: 隐患排查巡检:取风险点巡检记录里面巡检类型是生产巡检的数据
207 QueryWrapper<?> queryWrapper2 = new QueryWrapper<>(); 207 QueryWrapper<?> queryWrapper2 = new QueryWrapper<>();
208 queryWrapper2.eq("inspection_type", "1") 208 queryWrapper2.eq("inspection_type", "1")
209 .eq("status", "2") 209 .eq("inspection_type", "4")
210 .ge("end_date", startDate + BusinessConstant.startTimeSuffix) 210 .ge("end_date", startDate + BusinessConstant.startTimeSuffix)
211 .le("end_date", endDate + BusinessConstant.endTimeSuffix); 211 .le("end_date", endDate + BusinessConstant.endTimeSuffix);
212 List<Map<String, Object>> queryMapList2 = baseService.queryForList("select * from danger_inspection_record", queryWrapper2); 212 List<Map<String, Object>> queryMapList2 = baseService.queryForList("select * from danger_inspection_record", queryWrapper2);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/web/EquipmentMaintainStandardController.java
...@@ -192,17 +192,17 @@ public class EquipmentMaintainStandardController { ...@@ -192,17 +192,17 @@ public class EquipmentMaintainStandardController {
192 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; 192 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
193 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); 193 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
194 //构造机构字典 194 //构造机构字典
195 List<Map<String,Object>> departList = iEquipmentMaintainStandardService.getDepartList("group"); 195 List<Map<String, Object>> departList = iEquipmentMaintainStandardService.getDepartList("group");
196 Map<String,String> departDictMap = new HashMap<String,String>(); 196 Map<String, String> departDictMap = new HashMap<String, String>();
197 departList.forEach(depart ->{ 197 departList.forEach(depart -> {
198 departDictMap.put(ConvertUtils.getString(depart.get("depart_name")), ConvertUtils.getString(depart.get("id"))); 198 departDictMap.put(ConvertUtils.getString(depart.get("depart_name")), ConvertUtils.getString(depart.get("id")));
199 }); 199 });
200 200
201 //构造设备类别字典 201 //构造设备类别字典
202 List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(); 202 List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list();
203 Map<String,String> equipmentCategoryDictMap = new HashMap<String,String>(); 203 Map<String, String> equipmentCategoryDictMap = new HashMap<String, String>();
204 equipmentCategoryList.forEach(equipmentCategory ->{ 204 equipmentCategoryList.forEach(equipmentCategory -> {
205 equipmentCategoryDictMap.put(equipmentCategory.getTreePathName(), equipmentCategory.getId()); 205 equipmentCategoryDictMap.put(equipmentCategory.getTreePathName(), equipmentCategory.getId());
206 }); 206 });
207 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { 207 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
208 // 获取上传文件对象 208 // 获取上传文件对象
...@@ -215,28 +215,11 @@ public class EquipmentMaintainStandardController { ...@@ -215,28 +215,11 @@ public class EquipmentMaintainStandardController {
215 List<EquipmentMaintainStandard> listsdEquipFailureRepairs = ExcelImportUtil.importExcel(multipartFile.getInputStream(), EquipmentMaintainStandard.class, params); 215 List<EquipmentMaintainStandard> listsdEquipFailureRepairs = ExcelImportUtil.importExcel(multipartFile.getInputStream(), EquipmentMaintainStandard.class, params);
216 //根据设备类型查出对应id 216 //根据设备类型查出对应id
217 listsdEquipFailureRepairs.forEach(e -> { 217 listsdEquipFailureRepairs.forEach(e -> {
218 //获取一级类型 218 String third = e.getEquipmentType();
219 String top = e.getEquipmentTopType(); 219 //机构字典翻译，并设置到保养库对象
220 //获取二级类型 220 e.setDepartId(departDictMap.get(e.getDepartId()));
221 String second = e.getEquipmentSecondType(); 221 //设备类型字典翻译，并设置到保养库对象
222 //获取三级类型 222 e.setEquipmentType(equipmentCategoryDictMap.get(third));
223 String third = e.getEquipmentType();
224
225 StringBuffer sb = new StringBuffer();
226 if(StringUtils.isNotBlank(top)) {
227 sb.append("/"+top);
228 }
229 if(StringUtils.isNotBlank(second)) {
230 sb.append("/"+second);
231 }
232 if(StringUtils.isNotBlank(third)) {
233 sb.append("/"+third);
234 }
235 String key = sb.substring(1);
236 //机构字典翻译，并设置到保养库对象
237 e.setDepartId(departDictMap.get(e.getDepartId()));
238 //设备类型字典翻译，并设置到保养库对象
239 e.setEquipmentType(equipmentCategoryDictMap.get(key));
240 }); 223 });
241 iEquipmentMaintainStandardService.addList(listsdEquipFailureRepairs); 224 iEquipmentMaintainStandardService.addList(listsdEquipFailureRepairs);
242 return Result.ok("文件导入成功！数据行数:" + listsdEquipFailureRepairs.size()); 225 return Result.ok("文件导入成功！数据行数:" + listsdEquipFailureRepairs.size());
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentMaintainStandard.java
...@@ -33,7 +33,7 @@ public class EquipmentMaintainStandard { ...@@ -33,7 +33,7 @@ public class EquipmentMaintainStandard {
33 @Excel(name = "保养项", width = 15) 33 @Excel(name = "保养项", width = 15)
34 @ApiModelProperty(value = "保养项") 34 @ApiModelProperty(value = "保养项")
35 private String maintenanceType; 35 private String maintenanceType;
36 @Excel(name = "设备三级类型", width = 15) 36 @Excel(name = "设备类型", width = 15)
37 @ApiModelProperty(value = "设备类型") 37 @ApiModelProperty(value = "设备类型")
38 private String equipmentType; 38 private String equipmentType;
39 39
...@@ -41,8 +41,7 @@ public class EquipmentMaintainStandard { ...@@ -41,8 +41,7 @@ public class EquipmentMaintainStandard {
41 @ApiModelProperty(value = "设备二级类型") 41 @ApiModelProperty(value = "设备二级类型")
42 @TableField(exist = false) 42 @TableField(exist = false)
43 private String equipmentSecondType; 43 private String equipmentSecondType;
44 44
45 @Excel(name = "设备类型", width = 15)
46 @ApiModelProperty(value = "设备一级类型") 45 @ApiModelProperty(value = "设备一级类型")
47 @TableField(exist = false) 46 @TableField(exist = false)
48 private String equipmentTopType; 47 private String equipmentTopType;
......
sk-module-system/src/main/java/com/skua/config/TaskPoolConfig.java
...@@ -50,9 +50,9 @@ public class TaskPoolConfig { ...@@ -50,9 +50,9 @@ public class TaskPoolConfig {
50 public ThreadPoolTaskExecutor taskExecutor2() { 50 public ThreadPoolTaskExecutor taskExecutor2() {
51 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); 51 ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
52 //配置核心线程数：就是线程池中的核心线程数量，这几个核心线程，只是在没有用的时候，也不会被回收 52 //配置核心线程数：就是线程池中的核心线程数量，这几个核心线程，只是在没有用的时候，也不会被回收
53 executor.setCorePoolSize(50); 53 executor.setCorePoolSize(100);
54 //配置最大线程数：就是线程池中可以容纳的最大线程的数量 54 //配置最大线程数：就是线程池中可以容纳的最大线程的数量
55 executor.setMaxPoolSize(200); 55 executor.setMaxPoolSize(500);
56 //配置队列大小 56 //配置队列大小
57 executor.setQueueCapacity(500); 57 executor.setQueueCapacity(500);
58 //线程池维护线程所允许的空闲时间：就是线程池中除了核心线程之外的其他的最长可以保留的时间，因为在线程池中，除了核心线程即使在无任务的情况下也不能被清除，其余的都是有存活时间的，意思就是非核心线程可以保留的最长的空闲时间 58 //线程池维护线程所允许的空闲时间：就是线程池中除了核心线程之外的其他的最长可以保留的时间，因为在线程池中，除了核心线程即使在无任务的情况下也不能被清除，其余的都是有存活时间的，意思就是非核心线程可以保留的最长的空闲时间
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
...@@ -160,6 +160,7 @@ public class MybatisInterceptor implements Interceptor { ...@@ -160,6 +160,7 @@ public class MybatisInterceptor implements Interceptor {
160 || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectList".equals(sqlId) //物料 160 || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectList".equals(sqlId) //物料
161 || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId) //采购合同列表 161 || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId) //采购合同列表
162 || "com.skua.modules.erp.mapper.DistributContractMapper.selectList".equals(sqlId) //分销合同列表 162 || "com.skua.modules.erp.mapper.DistributContractMapper.selectList".equals(sqlId) //分销合同列表
163 || "com.skua.modules.erp.mapper.ErpSettlementMapper.selectById".equals(sqlId) // 药剂结算单详情
163 || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.getListByDistributId".equals(sqlId) 164 || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.getListByDistributId".equals(sqlId)
164 || "com.skua.modules.system.datestandard.mapper.SysMonitorMetricInfoMapper.selectList".equals(sqlId) //点表 165 || "com.skua.modules.system.datestandard.mapper.SysMonitorMetricInfoMapper.selectList".equals(sqlId) //点表
165 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId) 166 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!