fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutLossOver.java
@@ -35,7 +35,7 @@ @TableField("dept_id") private String deptId; @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT 'å ¥åºä»åº'") @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT 'æçä»åº'") @TableField("depot_id") private String depotId; fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fzzy.igds.constant.RedisConst; import com.fzzy.igds.domain.Depot; import com.fzzy.igds.domain.DepotStore; import com.fzzy.igds.mapper.DepotMapper; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.redis.RedisCache; @@ -58,6 +59,17 @@ } /** * æ ¹æ®åºå表信æ¯ï¼æ´æ°ä»åºåºå * @param data */ public void updateByDepotStore(DepotStore data) { UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", data.getDepotId()).set("storage_real", data.getStorageReal()); depotMapper.update(null, updateWrapper); } /** * ä¿åæ´æ°ä»åºä¿¡æ¯ * * @param depot fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
@@ -1,18 +1,14 @@ package com.fzzy.igds.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.domain.Depot; import com.fzzy.igds.domain.DepotStore; import com.fzzy.igds.mapper.DepotMapper; import com.fzzy.igds.mapper.DepotStoreMapper; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; @@ -28,9 +24,9 @@ public class DepotStoreService { @Resource private DepotStoreMapper depotStoreMapper; private DepotService depotService; @Resource private DepotMapper depotMapper; private DepotStoreMapper depotStoreMapper; public void listPageData(Page<DepotStore> page, IgdsBaseParam param) { QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>(); @@ -53,41 +49,23 @@ depotStoreMapper.selectPage(page, queryWrapper); } /** * æ´æ°ä¿åæ°æ® * * @param data */ public void saveDepotStore(DepotStore data) { if (StringUtils.isEmpty(data.getCompanyId())) { data.setCompanyId(ContextUtil.getCompanyId()); } if (StringUtils.isEmpty(data.getDeptId())) { data.setDeptId(ContextUtil.subDeptId(null)); } if (StringUtils.isEmpty(data.getId())) { data.setId(data.getDepotId() + "_" + DateFormatUtils.format(data.getStoreDate(), "yyyyMMddHHmmss") + "_" + DateFormatUtils.format(data.getUpdateTime(), "yyyyMMddHHmmss")); data.setCreateTime(new Date()); data.setRemark("ç³»ç»çæ"); data.setUpdateBy(ContextUtil.getLoginUserName()); data.setUpdateTime(new Date()); depotStoreMapper.insert(data); }else{ data.setUpdateBy(ContextUtil.getLoginUserName()); data.setUpdateTime(new Date()); depotStoreMapper.updateById(data); } } /** * å 餿°æ® * * å æ´æ°ï¼å¦ææ²¡æåæ°å¢ * æ°æ®å¤çå¥½ï¼æ¤æ¹æ³ä¸å¤çä»»ä½å段 * @param data * @return */ public String delDepotStore(DepotStore data) { depotStoreMapper.deleteById(data); return null; public void updateAndSave(DepotStore data) { int i = depotStoreMapper.updateById(data); if(i < 1){ i = depotStoreMapper.insert(data); } if(i > 0){ //æ´æ¹å°ä»åºè¡¨ depotService.updateByDepotStore(data); } } /** @@ -101,9 +79,8 @@ QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("depot_id", depotId); queryWrapper.ge("create_time", time); queryWrapper.le("create_time", time); queryWrapper.orderByDesc("create_time"); queryWrapper.le("update_time", time); queryWrapper.orderByDesc("update_time"); List<DepotStore> list = depotStoreMapper.selectList(queryWrapper); @@ -111,19 +88,6 @@ return null; } return list.get(0); } public void addDepotStore(DepotStore store, boolean updateDepot) { if (null == store.getUpdateTime()) store.setUpdateTime(new Date()); if (null == store.getId()) store.setId(ContextUtil.generateId()); depotStoreMapper.insert(store); if (updateDepot) { UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", store.getDepotId()).set("storage_real", store.getStorageReal()); depotMapper.update(null, updateWrapper); } } } fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.constant.RedisConst; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.mapper.InoutConfMapper; import com.fzzy.igds.mapper.InoutSysConfMapper; import com.fzzy.igds.domain.InoutConf; @@ -31,6 +32,8 @@ public class InoutConfService { @Resource private ISysDeptService iSysDeptService; @Resource private CoreDeptService deptService; @Resource private InoutConfMapper inoutConfMapper; @Resource @@ -181,16 +184,16 @@ * @return */ public List<InoutConf> getInoutConfList(String companyId, String deptId) { QueryWrapper<InoutConf> queryWrapper = new QueryWrapper<>(); if (StringUtils.isEmpty(companyId)) { companyId = ContextUtil.getCompanyId(); } if (StringUtils.isEmpty(deptId)) { deptId = ContextUtil.subDeptId(null); } QueryWrapper<InoutConf> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("dept_id", deptId); queryWrapper.eq("company_id", companyId); if (StringUtils.isNotEmpty(deptId)) { queryWrapper.eq("dept_id", deptId); } return inoutConfMapper.selectList(queryWrapper); } @@ -244,12 +247,21 @@ * 设置ç¼å * * @param companyId * @param deptId */ public void flushInoutConfCache(String companyId, String deptId) { List<InoutConf> list = this.getInoutConfList(companyId, deptId); String key = RedisConst.buildKey(companyId, Constant.CACHE_INOUT_CONF_LIST, deptId); redisCache.setCacheObject(key, list); public void flushInoutConfCache(String companyId) { List<Dept> depts = deptService.listDept(null, companyId, null); if(null == depts || depts.isEmpty()){ return; } List<InoutConf> inoutConfList; for (Dept dept : depts) { inoutConfList = this.getInoutConfList(companyId, dept.getId()); if(null == inoutConfList || inoutConfList.isEmpty()){ continue; } String key = RedisConst.buildKey(companyId, Constant.CACHE_INOUT_CONF_LIST, dept.getId()); redisCache.setCacheObject(key, inoutConfList); } } /** fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutLossOverService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.domain.InoutLossOver; import com.fzzy.igds.domain.InoutStockChange; import com.fzzy.igds.mapper.InoutLossOverMapper; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; @@ -53,21 +54,24 @@ inoutLossOverMapper.selectPage(page, queryWrapper); } /** * æ¥è¯¢åºåºä¸ææä¿¡æ¯ * æ ¹æ®æ¶é´ç±»åï¼è·åæ°æ® * @param timeType * @param param * @return */ public List<InoutLossOver> listData(String companyId, String deptId) { public List<InoutLossOver> getDataByTime(String timeType, IgdsBaseParam param) { if(StringUtils.isBlank(timeType)){ return null; } QueryWrapper<InoutLossOver> queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotBlank(companyId)){ queryWrapper.eq("company_id", companyId); } if(StringUtils.isNotBlank(deptId)){ queryWrapper.eq("dept_id", deptId); } queryWrapper.orderByDesc("id"); queryWrapper.likeRight("dept_id", param.getDeptId()); queryWrapper.ge(timeType, param.getStart()); queryWrapper.le(timeType, param.getEnd()); queryWrapper.orderByAsc("loss_time"); return inoutLossOverMapper.selectList(queryWrapper); } fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -6,6 +6,7 @@ import com.fzzy.igds.constant.Constant; import com.fzzy.igds.constant.FoodVariety; import com.fzzy.igds.constant.RedisConst; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.data.InoutData; import com.fzzy.igds.data.InoutParam; import com.fzzy.igds.data.InoutPrintBill; @@ -23,6 +24,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.DecimalFormat; @@ -51,6 +53,7 @@ /** * å页æ¥è¯¢æ°æ® * * @param page * @param param */ @@ -67,6 +70,7 @@ /** * æ¥è¯¢æ°æ®éå * * @param param */ public List<InoutRecord> listInout(InoutParam param) { @@ -83,6 +87,7 @@ /** * å°è£ æ¥è¯¢æ¡ä»¶ * * @param param */ public QueryWrapper<InoutRecord> getQueryWrapper(InoutParam param) { @@ -141,9 +146,32 @@ return queryWrapper; } /** * æ ¹æ®æ¶é´ç±»åï¼è·åå·²å®æçæ£å¸¸åæ® * @param timeType * @param param * @return */ public List<InoutRecord> getCompleteInoutByTime(String timeType, IgdsBaseParam param) { if(StringUtils.isBlank(timeType)){ return null; } QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("dept_id", param.getDeptId()); queryWrapper.likeRight("progress", Constant.PROGRESS_RECORD); //已宿çåæ® queryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //䏿¯å é¤çååï¼å³æ£å¸¸çåå queryWrapper.ge(timeType, param.getStart()); queryWrapper.le(timeType, param.getEnd()); queryWrapper.orderByAsc("complete_time"); return inoutRecordMapper.selectList(queryWrapper); } /** * æ¥è¯¢æ°æ® * * @param param * @return */ @@ -158,6 +186,7 @@ /** * éªè¯è½¦çå·æ¯å¦å¨æµç¨ä¸ * * @param companyId * @param plateNum * @return @@ -177,6 +206,7 @@ /** * æå¨è¡¥å * * @param data * @return */ @@ -274,6 +304,7 @@ /** * å¼å¸¸ç»æ¢ * * @param data * @return */ @@ -306,6 +337,7 @@ /** * åºå ¥åºæµç¨IDå建 202001030001 202001030001 * * @param registerTime * @param companyId * @return @@ -369,6 +401,7 @@ /** * æ¥è¯¢æå¤§idå·ï¼ä¸ºç©ºåè¿ånull * * @param companyId * @param timeKey * @return fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutStockChangeService.java
@@ -2,6 +2,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.data.InoutParam; import com.fzzy.igds.domain.InoutRecord; import com.fzzy.igds.domain.InoutStockChange; import com.fzzy.igds.mapper.InoutStockChangeMapper; import com.fzzy.igds.utils.ContextUtil; @@ -50,6 +54,28 @@ inoutStockChangeMapper.selectPage(page, queryWrapper); } /** * æ ¹æ®æ¶é´ç±»åï¼è·åæ°æ® * @param timeType * @param param * @return */ public List<InoutStockChange> getDataByTime(String timeType, IgdsBaseParam param) { if(StringUtils.isBlank(timeType)){ return null; } QueryWrapper<InoutStockChange> queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("dept_id", param.getDeptId()); queryWrapper.ge(timeType, param.getStart()); queryWrapper.le(timeType, param.getEnd()); queryWrapper.orderByAsc("change_date"); return inoutStockChangeMapper.selectList(queryWrapper); } /** * ä¿åæ°æ® * @param data fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobDepotStoreService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,294 @@ package com.fzzy.igds.timer; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.domain.*; import com.fzzy.igds.service.*; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDate; import java.util.*; /** * @Description åºå宿¶ç»è®¡å ¥å£ï¼éè¿æ¡æ¶å®æ¶ä»»å¡è°ç¨ï¼é»è®¤æ¯å¤©åæ¨1ç¹æ§è¡ï¼ç»è®¡æ¨å¤©çåºåä¿¡æ¯ * @Author CZT * @Date 2026/1/14 10:42 */ @Slf4j @Service public class JobDepotStoreService { @Resource private CoreDeptService deptService; @Resource private InoutRecordService inoutRecordService; @Resource private InoutStockChangeService stockChangeService; @Resource private InoutLossOverService lossOverService; @Resource private DepotStoreService depotStoreService; @Resource private DepotService depotService; public void timer() { doExe(); } /** * å¼å§æ§è¡åºåç»è®¡ */ public void doExe() { Date time = DateUtil.getNewByDay(new Date(), -1); log.info("===============ç³»ç»å®æ¶ç»è®¡åºåä¿¡æ¯==============="); //è·åææçåºåºä¿¡æ¯ List<Dept> listDept = deptService.listDept(null, ContextUtil.getCompanyId(), null); if (null == listDept || listDept.isEmpty()) { log.info("-----æªè·åå°åºåºï¼ä¸æ§è¡åºå宿¶ç»è®¡-----"); return; } Date startTime = null; //åºå ¥åºææ©æ¶é´ for (Dept dept : listDept) { startTime = getStartTime(time, dept); if (null == startTime) { log.info("-----{}å¨{}æªæåºåç¸å ³æ°éæ´æ°ï¼ä¸æ§è¡åºåç»è®¡-----", dept.getKqmc(), DateFormatUtils.format(time, "yyyy-MM-dd")); continue; } //å¤å¤©å¾ªç¯ç»è®¡ sumMoreDepotStore(startTime, time, dept); } } /** * å¤å¤©å¾ªç¯éåç»è®¡åºåä¿¡æ¯ * * @param startTime * @param endTime * @param dept */ public void sumMoreDepotStore(Date startTime, Date endTime, Dept dept) { log.info("-----ç»è®¡åºåä¿¡æ¯ï¼åºåº={}ï¼æ¶é´={}--->{}-----", dept.getKqmc(), DateFormatUtils.format(startTime, "yyyy-MM-dd"), DateFormatUtils.format(endTime, "yyyy-MM-dd")); //è·å两个æ¶é´ç¸å·®çå¤©æ° LocalDate startDate = LocalDate.parse(DateFormatUtils.format(startTime, "yyyy-MM-dd")); LocalDate endDate = LocalDate.parse(DateFormatUtils.format(endTime, "yyyy-MM-dd")); //仿æ©å¤©å¼å§å¾ªç¯ç»è®¡åºåå°å½å天 while (!startDate.isAfter(endDate)) { //ç»è®¡åºåºåºå sumDepotStore(startTime, dept); //å¯¹åºæ¶é´å 1天 startTime = DateUtils.addDays(startTime, 1); //å°æ¥æå 1天 startDate = startDate.plusDays(1); } } /** * æ ¹æ®æ¶é´ï¼ç»è®¡æ´æ°å½å¤©çåºåä¿¡æ¯ * * @param time * @param dept */ public void sumDepotStore(Date time, Dept dept) { //æ´æ¹ä¸ºå½å¤©ç23ç¹50å time = DateUtils.addMinutes(DateUtil.getNextZero(time), -10); log.info("-----ç»è®¡åºåä¿¡æ¯ï¼åºåº={}ï¼æ¶é´={}-----", dept.getKqmc(), DateFormatUtils.format(time, "yyyy-MM-dd")); //è®¾ç½®åæ° IgdsBaseParam param = new IgdsBaseParam(); param.setStart(DateUtil.getCurZero(time)); param.setEnd(DateUtil.getNextZero(time)); param.setDeptId(dept.getId()); //ç¨äºåæ¾æ°éåå¨çä»åº Set<String> set = new HashSet<>(); //ç»è®¡ä»åºçæ°é Map<String, Double> map1 = new HashMap<>(); Map<String, Double> map2 = new HashMap<>(); Map<String, Double> map3 = new HashMap<>(); boolean inTag = false; boolean outTag = false; //è·ååºå ¥åºä¿¡æ¯ç»è®¡ä»åºæ°é List<InoutRecord> inoutRecords = inoutRecordService.getCompleteInoutByTime("complete_time", param); if (null != inoutRecords && !inoutRecords.isEmpty()) { for (InoutRecord inoutRecord : inoutRecords) { set.add(inoutRecord.getDepotId()); map1.putIfAbsent(inoutRecord.getDepotId(), 0.0); //ç»è®¡æ°é if (Constant.TYPE_IN.equals(inoutRecord.getType())) { inTag = true; map1.put(inoutRecord.getDepotId(), map1.get(inoutRecord.getDepotId()) + inoutRecord.getRecordWeight()); } if (Constant.TYPE_OUT.equals(inoutRecord.getType())) { outTag = true; map1.put(inoutRecord.getDepotId(), map1.get(inoutRecord.getDepotId()) - inoutRecord.getRecordWeight()); } } } //è·ååä»ä¿¡æ¯ç»è®¡ä»åºæ°é List<InoutStockChange> stockChanges = stockChangeService.getDataByTime("change_date", param); if (null != stockChanges && !stockChanges.isEmpty()) { for (InoutStockChange stockChange : stockChanges) { set.add(stockChange.getDepotIdIn()); set.add(stockChange.getDepotIdOut()); map2.putIfAbsent(stockChange.getDepotIdIn(), 0.0); map2.putIfAbsent(stockChange.getDepotIdOut(), 0.0); //ç»è®¡æ°é map2.put(stockChange.getDepotIdIn(), map2.get(stockChange.getDepotIdIn()) + stockChange.getNumber()); map2.put(stockChange.getDepotIdOut(), map2.get(stockChange.getDepotIdOut()) - stockChange.getNumber()); } } //è·åæçä¿¡æ¯ç»è®¡ä»åºæ°é List<InoutLossOver> lossOvers = lossOverService.getDataByTime("loss_time", param); if (null != lossOvers && !lossOvers.isEmpty()) { for (InoutLossOver lossOver : lossOvers) { set.add(lossOver.getDepotId()); map3.putIfAbsent(lossOver.getDepotId(), 0.0); //ç»è®¡æ°é if (Constant.TYPE_LOSS.equals(lossOver.getType())) { map1.put(lossOver.getDepotId(), map1.get(lossOver.getDepotId()) - lossOver.getAmount()); } if (Constant.TYPE_OVER.equals(lossOver.getType())) { map1.put(lossOver.getDepotId(), map1.get(lossOver.getDepotId()) + lossOver.getAmount()); } } } Double sum = 0.0; Depot depot; for (String s : set) { sum = 0.0; if (null != map1.get(s)) { sum += map1.get(s); } if (null != map2.get(s)) { sum += map2.get(s); } if (null != map3.get(s)) { sum += map3.get(s); } //è·åä¸ä¸æ¡æ°æ® DepotStore lastData = depotStoreService.getLastData(s, time); if (null == lastData) { lastData = new DepotStore(); //主é®IDè§åï¼yyyyMMddHHmm_ä»åºç¼ç lastData.setId(DateFormatUtils.format(time, "yyyyMMddHHmm") + "_" + s); lastData.setCompanyId(dept.getCompanyId()); lastData.setDeptId(dept.getId()); lastData.setDepotId(s); lastData.setStorageReal(0.0); lastData.setUpdateTime(time); lastData.setUpdateBy("ç³»ç»å®æ¶ç»è®¡"); if (inTag) { //è®¾ç½®å ¥åºæ¶é´ lastData.setStoreDate(time); } if (outTag) { //设置åºåºæ¶é´ lastData.setOutDate(time); } //è·åä»åºä¿¡æ¯ depot = depotService.getCacheDepot(dept.getCompanyId(), s); if (null != depot) { lastData.setDepotStatus(depot.getDepotStatus()); lastData.setFoodVariety(depot.getFoodVariety()); lastData.setFoodLevel(depot.getFoodLevel()); lastData.setFoodLocation(depot.getFoodLocation()); lastData.setFoodLocationId(depot.getFoodLocationId()); lastData.setFoodType(depot.getFoodType()); lastData.setFoodYear(depot.getFoodYear()); } } lastData.setStorageReal(lastData.getStorageReal() + sum); lastData.setCreateTime(new Date()); //è®¾ç½®ä¸ºææ°æ¶é´ï¼å ¶ä»ç³»ç»å¯ä»¥éè¿æ¤æ¶é´æ¥è¯¢æ°æ®æ¯å¦ææ´æ°ä¿®æ¹ï¼åæ¥å°ç平尿¥å£ã lastData.setCreateBy("ç³»ç»å®æ¶ç»è®¡"); lastData.setRemark("ç³»ç»ç»è®¡" + DateFormatUtils.format(time, "yyyy-MM-dd") + "æ¥åºå"); depotStoreService.updateAndSave(lastData); } } /** * æ ¹æ®æ¶é´ï¼ç»è®¡æ´æ°å½å¤©çåºåä¿¡æ¯ * * @param dept */ public Date getStartTime(Date time, Dept dept) { Date startTime = time; //åºå ¥åºææ©æ¶é´ Date time1 = null; //åºå ¥åºææ©æ¶é´ Date time2 = null; //åä»ææ©æ¶é´ Date time3 = null; //æçææ©æ¶é´ //è·åå½å¤©ææ´æ°çåºå ¥åºä¿¡æ¯ IgdsBaseParam param = new IgdsBaseParam(); param.setStart(DateUtil.getCurZero(time)); param.setEnd(DateUtil.getNextZero(time)); //è·åå½å¤©ææ´æ°çåºå ¥åºä¿¡æ¯ param.setDeptId(dept.getId()); List<InoutRecord> inoutRecords = inoutRecordService.getCompleteInoutByTime("update_time", param); if (null != inoutRecords && !inoutRecords.isEmpty()) { time1 = inoutRecords.get(0).getCompleteTime(); } //è·åå½å¤©ææ´æ°çå仿°æ® List<InoutStockChange> stockChanges = stockChangeService.getDataByTime("update_time", param); if (null != stockChanges && !stockChanges.isEmpty()) { time2 = stockChanges.get(0).getChangeDate(); } //è·åå½å¤©ææ´æ°çæçæ°æ® List<InoutLossOver> lossOvers = lossOverService.getDataByTime("update_time", param); if (null != lossOvers && !lossOvers.isEmpty()) { time3 = lossOvers.get(0).getLossTime(); } if (null == time1 && null == time2 && null == time3) { return null; } if (null != time1 && time1.before(startTime)) { startTime = time1; } if (null != time2 && time2.before(startTime)) { startTime = time2; } if (null != time3 && time3.before(startTime)) { startTime = time3; } return startTime; } } fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfPR.java
@@ -65,7 +65,7 @@ */ @Expose public void flushCache(InoutConf data) { inoutConfService.flushInoutConfCache(data.getCompanyId(), data.getDeptId()); inoutConfService.flushInoutConfCache(data.getCompanyId()); } } fzzy-igdss-web/src/main/java/com/fzzy/init/SystemRunner.java
@@ -2,6 +2,7 @@ import com.fzzy.igds.domain.Dept; import com.fzzy.igds.service.*; import com.ruoyi.system.domain.SysCompany; import com.ruoyi.system.service.ISysCompanyService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; @@ -46,11 +47,11 @@ public void run(String... args) throws Exception { //ç»ç»ä¿¡æ¯æ¾å ¥ç¼å iSysCompanyService.resetCompanyCache(); List<Dept> list = coreDeptService.listDept(null, null, null); List<SysCompany> list = iSysCompanyService.selectAll(); for (Dept dept : list) { for (SysCompany company : list) { flushCache(dept.getCompanyId(),dept.getId(), "ç³»ç»è°ç¨"); flushCache(company.getCompanyId(), "ç³»ç»è°ç¨"); } } @@ -60,7 +61,7 @@ * @param companyId * @param name */ public void flushCache(String companyId,String deptId, String name) { public void flushCache(String companyId, String name) { //åå§åç¨æ·é¨é¨å°å å sysDeptService.initUserDeptMap(companyId); @@ -72,7 +73,7 @@ inoutConfService.flushInoutSysConfCache(); //åå§è®¾å¤é ç½® inoutConfService.flushInoutConfCache(companyId, deptId); inoutConfService.flushInoutConfCache(companyId); //åå§åä»åºç¼å depotService.flushCache(companyId); fzzy-igdss-web/src/main/java/com/fzzy/sys/init/SystemRunner.java
ÎļþÒÑɾ³ý fzzy-igdss-web/src/main/resources/templates/index.html
@@ -152,7 +152,7 @@ </button> <nav class="page-tabs menuTabs"> <div class="page-tabs-content"> <a th:href="@{/index}" class="active menuTab" th:data-id="${welcomeUrl}">欢è¿</a> <a href="javascript:void(0);" class="active menuTab" th:data-id="${welcomeUrl}">欢è¿</a> </div> </nav> <button class="roll-nav roll-right tabRight"> fzzy-igdss-web/src/main/resources/templates/login.html
@@ -120,7 +120,7 @@ <!--ææºAPP--> <div class="login2-ewm css-hand"> <h3> <i class="i-icon"><img th:src="@{/login/images/login-app-code.png}"/></i>ä¸è½½APP <!-- <i class="i-icon"><img th:src="@{/login/images/login-app-code.png}"/></i>ä¸è½½APP--> </h3> </div>