diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java index 7564f6c..59a8857 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java @@ -197,30 +197,30 @@ public class ArchivesController { @ApiOperation("档案类别数量统计") @GetMapping("/initArchivesTypeNum") - public ApiResponse initArchivesTypeNum(Integer type) + public ApiResponse initArchivesTypeNum(Integer year) { - return ApiResponse.success(archivesService.initArchivesTypeNum(type)); + return ApiResponse.success(archivesService.initArchivesTypeNum(year)); } @ApiOperation("档案类型统计") @GetMapping("/initArchivesTypeStatistics") - public ApiResponse initArchivesTypeStatistics(Integer type) + public ApiResponse initArchivesTypeStatistics(String yearMonth) { - return ApiResponse.success(archivesService.initArchivesTypeStatistics(type)); + return ApiResponse.success(archivesService.initArchivesTypeStatistics(yearMonth)); } @ApiOperation("档案实际情况") @GetMapping("/initAddArchivesStatistics") - public ApiResponse initAddArchivesStatistics(Integer type) + public ApiResponse initAddArchivesStatistics(Integer year) { - return ApiResponse.success(archivesService.initAddArchivesStatistics(type)); + return ApiResponse.success(archivesService.initAddArchivesStatistics(year)); } @ApiOperation("档案检索排名") @GetMapping("/initArchivesSearchRanking") - public ApiResponse initArchivesSearchRanking(Integer type) + public ApiResponse initArchivesSearchRanking(String yearMonth) { - return ApiResponse.success(archivesService.initArchivesSearchRanking(type)); + return ApiResponse.success(archivesService.initArchivesSearchRanking(yearMonth)); } @ApiOperation("根据门类导出数据") diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/CallExternalController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/CallExternalController.java new file mode 100644 index 0000000..4193420 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/CallExternalController.java @@ -0,0 +1,205 @@ +package com.storeroom.modules.archives.controller; + +import com.alibaba.fastjson.JSONObject; +import com.storeroom.modules.device.service.DeviceService; +import com.storeroom.modules.device.service.dto.DeviceInfoDto; +import com.storeroom.utils.ApiResponse; +import com.storeroom.utils.HttpUtils; +import com.storeroom.utils.StringUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.apache.http.HttpResponse; +import org.apache.http.util.EntityUtils; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; + +@RestController +@RequiredArgsConstructor +@Api(tags = "调用外部接口") +@RequestMapping("/api/callExternal") +public class CallExternalController { + + private final DeviceService deviceService; + + @ApiOperation("打开架体具体某一列") + @GetMapping("/openCol") + public ApiResponse openCol( + String deviceId,Integer quNo, Integer colNo,Integer leNo, Integer divNo,Integer zyNo + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + if(quNo!=null) + json.put("QuNo",quNo); + if(colNo!=null) + json.put("ColNo",colNo); + if(leNo!=null) + json.put("LeNo",leNo); + if(divNo!=null) + json.put("DivNo",divNo); + if(zyNo!=null) + json.put("ZyNo",zyNo); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/OpenCol", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("打开档案所在位置") + @GetMapping("/findFiles") + public ApiResponse findFiles( + String deviceId,String fileName,String storeCode,Integer quNo, Integer colNo,Integer leNo, Integer divNo,Integer zyNo,String position,Integer type + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("fileName",fileName); + json.put("position",position); + json.put("type",type); + JSONObject json1 = new JSONObject(); + json1.put("storeCode", StringUtils.isEmpty(device.getStoreroomCode()) ? "12345678" : device.getStoreroomCode()); + json1.put("quNo",quNo); + json1.put("colNo",colNo); + json1.put("leNo",leNo); + json1.put("divNo",divNo); + json1.put("zyNo",zyNo); + json.put("positionKey",json1); + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/findFiles", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("获取密集架实时状态") + @GetMapping("/reportStatus") + public ApiResponse reportStatus( + String deviceId,String StoreCode,Integer quNo + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("storeCode", StringUtils.isEmpty(device.getStoreroomCode()) ? "12345678" : device.getStoreroomCode()); + json.put("QuNo",quNo); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/ReportStatus", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("停止移动") + @GetMapping("/stopMove") + public ApiResponse stopMove( + String deviceId,String StoreCode,Integer quNo + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("storeCode", StringUtils.isEmpty(device.getStoreroomCode()) ? "12345678" : device.getStoreroomCode()); + json.put("QuNo",quNo); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/StopMove", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("密集架通风") + @GetMapping("/vent") + public ApiResponse vent( + String deviceId,String StoreCode,Integer quNo + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("storeCode", StringUtils.isEmpty(device.getStoreroomCode()) ? "12345678" : device.getStoreroomCode()); + json.put("QuNo",quNo); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/Vent", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("密集架合架") + @GetMapping("/reset") + public ApiResponse reset( + String deviceId,String StoreCode,Integer quNo + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("storeCode", StringUtils.isEmpty(device.getStoreroomCode()) ? "12345678" : device.getStoreroomCode()); + json.put("QuNo",quNo); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/Reset", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + + @ApiOperation("公告下发") + @GetMapping("/getNotice") + public ApiResponse getNotice( + String deviceId,String notice + ){ + String retust = ""; + DeviceInfoDto device = deviceService.findById(deviceId); + JSONObject json = new JSONObject(); + json.put("notice",notice); + + try { + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/getNotice", + "POST", map, null, json.toJSONString()); + retust = EntityUtils.toString(response.getEntity()); + }catch (Exception e){ + retust = "连接失败"; + } + return ApiResponse.success(retust); + } + +} diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java index d38854d..5d8eb81 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java @@ -21,11 +21,13 @@ import com.storeroom.modules.device.service.DeviceService; import com.storeroom.modules.device.service.OperatingStateService; import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.utils.ApiResponse; +import com.storeroom.utils.HttpUtils; import com.storeroom.utils.StringUtils; import com.storeroom.utils.enums.ResponseStatus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.apache.http.HttpResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.data.domain.Pageable; import org.springframework.validation.annotation.Validated; @@ -35,6 +37,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -130,8 +133,11 @@ public class StorageController { Integer deviceType = thisCase.getFolderLocation().split("-").length == 5?1:2; try { if(deviceType==1){ + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); +// map.put("Authorization", "Bearer" + token + ""); + String[] shelf = thisCase.getFolderLocation().split("-"); - String url = "http://"+device.getDeviceIp()+":"+device.getDevicePort()+"IntelligentCabinetAPIServer/Task"; JSONObject json = new JSONObject(); json.put("id",thisCase.getId()); json.put("type",1); @@ -147,7 +153,8 @@ public class StorageController { json1.put("zyNo",shelf[4]); json.put("positionKey",json1); json.put("filetype",thisCase.getCaseType()); - String reselt = HttpUtil.wlwHttpURLConnection(url,json,null,null,null); +// String reselt = HttpUtil.wlwHttpURLConnection(url,json,null,null,null); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/Task", "POST", map, null, json.toJSONString()); }else{ } @@ -184,8 +191,11 @@ public class StorageController { if(null != linkage && isCallback){ try { if(deviceType==1){ + HashMap map = new HashMap<>(); + map.put("Content-type", "application/json"); +// map.put("Authorization", "Bearer" + token + ""); String[] shelf = thisCase.getFolderLocation().split("-"); - String url = "http://"+device.getDeviceIp()+":"+device.getDevicePort()+"IntelligentCabinetAPIServer/Task"; +// String url = "http://"+device.getDeviceIp()+":"+device.getDevicePort()+"IntelligentCabinetAPIServer/Task"; JSONObject json = new JSONObject(); json.put("id",caseId); json.put("type",2); @@ -201,7 +211,8 @@ public class StorageController { json1.put("zyNo",shelf[4]); json.put("positionKey",json1); json.put("filetype",thisCase.getCaseType()); - String reselt = HttpUtil.wlwHttpURLConnection(url,json,null,null,null); +// String reselt = HttpUtil.wlwHttpURLConnection(url,json,null,null,null); + HttpResponse response = HttpUtils.doPost("http://"+device.getDeviceIp()+":"+device.getDevicePort(), "/IntelligentCabinetAPIServer/Task", "POST", map, null, json.toJSONString()); }else{ } @@ -327,9 +338,9 @@ public class StorageController { @ApiOperation("出入库月份统计") @GetMapping("/storageStatistics") public ApiResponse storageStatistics( - Integer type + Integer year ){ - return ApiResponse.success(caseService.storageStatistics(type)); + return ApiResponse.success(caseService.storageStatistics(year)); } @ApiOperation("导出出入库记录") diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java index ec1a6fc..80a2de7 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java @@ -77,6 +77,14 @@ public class TagController { return ApiResponse.success(archivesTagService.updateEasByTid(dtos)); } + @ApiOperation("根据区列获取在库已借数") + @GetMapping("/getInBorrowByQuCol") + public ApiResponse getInBorrowByQuCol( + String deviceId,Integer quNo,Integer colNo + ){ + return ApiResponse.success(archivesTagService.getInBorrowByQuCol(deviceId,quNo,colNo)); + } + @ApiOperation("导出标签使用信息") @AnonymousGetMapping("/exportTagLogList") @ResponseBody diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java index 4203c9e..7779cd1 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesSummaryRepository.java @@ -195,23 +195,23 @@ public interface ArchivesSummaryRepository extends JpaRepository previewArrangeAll(Pageable page); @Query(nativeQuery = true, - value = "select count(1) from archives_summary where category_type = ?1 and if(?2 = 1,YEAR(create_time) = YEAR(NOW()),1=1)") - Integer getArchivesNumByTpye(Integer type,Integer timeType); + value = "select count(1) from archives_summary where category_type = ?1 and if(?2 is null,1=1,YEAR(create_time) = ?2)") + Integer getArchivesNumByTpye(Integer type,Integer year); @Query(nativeQuery = true, - value = "select count(1) from archives_summary where category_id = ?1 and if(?2 = 1,YEAR(create_time) = YEAR(NOW()),1=1)") - Integer getArchivesNumByCategoryIds(List categoryIds,Integer type); + value = "select count(1) from archives_summary where category_id = ?1 and if(?2 is null,1=1,DATE_FORMAT(create_time,'%Y-%m') = ?2)") + Integer getArchivesNumByCategoryIds(List categoryIds,String yearMonth); @Query(nativeQuery = true, value = "SELECT date_format(create_time, '%c') as month,count(1) as num " + "FROM archives_summary where (category_type = 3 or category_type = 5) " + - "AND if(?1 = 1,YEAR(create_time) = YEAR(NOW()),1=1) group by month") - List> initAddArchivesStatistics(Integer timeType); + "AND if(?1 is null,1=1,YEAR(create_time) = ?1) group by month") + List> initAddArchivesStatistics(Integer year); @Query(nativeQuery = true, value = "select t2.id,t2.cn_name as cnName,t1.num from (select category_root_id,count(1) as num " + - "from archives_search_log where if(?1 = 1,YEAR(create_time) = YEAR(NOW()),1=1) group by category_root_id order by num desc limit 0,5) t1 " + + "from archives_search_log where if(?1 is null,1=1,DATE_FORMAT(create_time,'%Y-%m') = ?1) group by category_root_id order by num desc limit 0,5) t1 " + "inner join archives_type t2 on t1.category_root_id = t2.id order by num desc") - List> initArchivesSearchRanking(Integer timeType); + List> initArchivesSearchRanking(String yearMonth); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java index 7c9dbb7..6f66a37 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java @@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; public interface ArchivesTagRepository extends JpaRepository{ @@ -25,4 +26,12 @@ public interface ArchivesTagRepository extends JpaRepository> getInBorrowByQuCol(String deviceId, Integer quNo, Integer colNo); + } diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/StorageLogRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/StorageLogRepository.java index c065843..67a1ef5 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/StorageLogRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/StorageLogRepository.java @@ -22,7 +22,7 @@ public interface StorageLogRepository extends JpaRepository value = "select t.month,max(if(t.storage_type=1,num,0)) as doInStorage,max(if(t.storage_type=2,num,0)) as inStorage," + "max(if(t.storage_type=3,num,0)) as doOutStorage,max(if(t.storage_type=4,num,0)) as outStorage " + "from (select storage_type,date_format(create_time, '%c') as month,count(1) as num from storage_log " + - "where if(?1 = 1,YEAR(create_time) = YEAR(NOW()),1=1) group by storage_type,month) t group by t.month") - List> storageStatistics(Integer timeType); + "where if(?1 is null,1=1,YEAR(create_time) = ?1) group by storage_type,month) t group by t.month") + List> storageStatistics(Integer year); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesCaseService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesCaseService.java index 49ce081..40324f3 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesCaseService.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesCaseService.java @@ -87,5 +87,5 @@ public interface ArchivesCaseService { //第三方回调 Integer externalCallback(String caseId); //出入库统计 - Object storageStatistics(Integer type); + Object storageStatistics(Integer year); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java index 1652aaa..c337cb4 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java @@ -64,11 +64,11 @@ public interface ArchivesService { //档案类别数量统计 Map initArchivesTypeNum(Integer type); //档案类型统计 - Object initArchivesTypeStatistics(Integer type); + Object initArchivesTypeStatistics(String yearMonth); //档案实际情况 - Object initAddArchivesStatistics(Integer type); + Object initAddArchivesStatistics(Integer year); //档案检索排名 - Object initArchivesSearchRanking(Integer type); + Object initArchivesSearchRanking(String yearMonth); diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesTagService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesTagService.java index e4ea52f..8b49729 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesTagService.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesTagService.java @@ -27,5 +27,7 @@ public interface ArchivesTagService { Object updateEasByTid(List dtos); //根据标签id更改报警状态 Object updateEasByTid(String eas,String tid); + //根据设备号区列获取在库借出档案数 + Object getInBorrowByQuCol(String deviceId,Integer quNo,Integer colNo); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java index d329adf..a94eb6f 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java @@ -812,14 +812,14 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService { } @Override - public Object storageStatistics(Integer type) { + public Object storageStatistics(Integer year) { List monthList = new ArrayList<>(); List doInStorage = new ArrayList<>(); List inStorage = new ArrayList<>(); List doOutStorage = new ArrayList<>(); List outStorage = new ArrayList<>(); - List> listMap = storageLogRepository.storageStatistics(type); + List> listMap = storageLogRepository.storageStatistics(year); Map> dataMap = new HashMap<>(); for(Map map:listMap){ dataMap.put(map.get("month")+"",map); diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java index a47a3c6..3eed3df 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java @@ -1001,17 +1001,17 @@ public class ArchivesServiceImpl implements ArchivesService { } @Override - public Map initArchivesTypeNum(Integer type) { + public Map initArchivesTypeNum(Integer year) { Map map = new HashMap<>(); - Integer archivesNum = archivesSummaryRepository.getArchivesNumByTpye(ArchivesTypeEnum.archives.getCode(),type); - Integer filesNum = archivesSummaryRepository.getArchivesNumByTpye(ArchivesTypeEnum.files.getCode(),type); + Integer archivesNum = archivesSummaryRepository.getArchivesNumByTpye(ArchivesTypeEnum.archives.getCode(),year); + Integer filesNum = archivesSummaryRepository.getArchivesNumByTpye(ArchivesTypeEnum.files.getCode(),year); map.put("archivesNum",archivesNum); map.put("filesNum",filesNum); return map; } @Override - public Object initArchivesTypeStatistics(Integer type) { + public Object initArchivesTypeStatistics(String yearMonth) { List> list = new ArrayList<>(); //获得根目录门类 ArchivesType root = archivesTypeRepository.findByPid("0"); @@ -1028,17 +1028,17 @@ public class ArchivesServiceImpl implements ArchivesService { } Map map = new HashMap<>(); map.put("archivesType",archivesType.getCnName()); - map.put("archivesNum",archivesSummaryRepository.getArchivesNumByCategoryIds(categoryIds,type)); + map.put("archivesNum",archivesSummaryRepository.getArchivesNumByCategoryIds(categoryIds,yearMonth)); list.add(map); } return list; } @Override - public Object initAddArchivesStatistics(Integer type) { + public Object initAddArchivesStatistics(Integer year) { List monthList = new ArrayList<>(); List addNum = new ArrayList<>(); - List> listMap = archivesSummaryRepository.initAddArchivesStatistics(type); + List> listMap = archivesSummaryRepository.initAddArchivesStatistics(year); Map> dataMap = new HashMap<>(); for(Map map:listMap){ dataMap.put(map.get("month")+"",map); @@ -1059,8 +1059,8 @@ public class ArchivesServiceImpl implements ArchivesService { } @Override - public Object initArchivesSearchRanking(Integer type) { - return archivesSummaryRepository.initArchivesSearchRanking(type); + public Object initArchivesSearchRanking(String yearMonth) { + return archivesSummaryRepository.initArchivesSearchRanking(yearMonth); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesTagServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesTagServiceImpl.java index f5b67b3..6ea197b 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesTagServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesTagServiceImpl.java @@ -225,5 +225,10 @@ public class ArchivesTagServiceImpl implements ArchivesTagService { return writeEas; } + @Override + public Object getInBorrowByQuCol(String deviceId, Integer quNo, Integer colNo) { + return archivesTagRepository.getInBorrowByQuCol(deviceId,quNo,colNo); + } + }