针筒删除资源空间bug修改

杰生迭代

hx-service/storage/src/main/java/com/fjhx/supplier/controller/SupplierController.java

@@ -234,5 +234,17 @@ public class SupplierController {
         return R.success(list);
     }
 
+    @PostMapping("getAccountDateList")
+    public R getAccountDate() {
+        List<Map<String, Object>> result = supplierService.getAccountDate();
+        return R.success(result);
+    }
+
+    @PostMapping("getSafetyWarnDayList")
+    public R getSafetyWarnDayList() {
+        List<Map<String, Object>> result = supplierService.getSafetyWarnDayList();
+        return R.success(result);
+    }
+
 }
 

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.java

@@ -156,4 +156,7 @@ public interface SupplierMapper extends BaseMapper<Supplier> {
     @TenantIgnore
     List<Supplier> selectList(Map<String, Object> condition);
 
+    @TenantIgnore
+    List<Map<String, Object>> getSafetyWarnDayList();
+
 }

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.xml

@@ -301,6 +301,13 @@
         <include refid="sql_limit"/>
     </select>
 
+    <select id="getSafetyWarnDayList" resultType="java.util.Map">
+        select m.SafetyWarnDay safetyWarnDay,
+               sp.FactoryId    factoryId
+        from material m
+                 inner join supplier_price sp on sp.FactoryId is not null and sp.MaterialCode = m.Code
+    </select>
+
 
     <sql id="warningCount_filed">
         SELECT count(1)

hx-service/storage/src/main/java/com/fjhx/supplier/service/SupplierService.java

@@ -149,4 +149,9 @@ public interface SupplierService extends BaseService<Supplier> {
      * @return
      */
     List<Supplier> selectList(Map<String, Object> condition);
+
+    List<Map<String, Object>> getAccountDate();
+
+    List<Map<String, Object>> getSafetyWarnDayList();
+
 }

hx-service/storage/src/main/java/com/fjhx/supplier/service/impl/SupplierServiceImpl.java

@@ -1,14 +1,14 @@
 package com.fjhx.supplier.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.attachment.service.StockAttachmentService;
 import com.fjhx.entity.attachment.StockAttachment;
 import com.fjhx.entity.attachment.enums.AttachmentTypeEnum;
-import com.fjhx.purchase.service.PurchaseContractService;
 import com.fjhx.entity.supplier.Supplier;
+import com.fjhx.purchase.service.PurchaseContractService;
 import com.fjhx.supplier.mapper.SupplierMapper;
 import com.fjhx.supplier.service.SupplierService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.utils.CodeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -20,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -42,17 +40,19 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     @Autowired
     private PurchaseContractService purchaseContractService;
+
     /**
      * 列表
+     *
      * @param condition
      * @return
      * @throws ParseException
      */
     @Override
-    public List<Supplier> getList(Map<String, Object> condition){
-        if(ObjectUtil.isNotEmpty(condition.get("TechnologyType"))&&
-                StringUtil.equals(condition.get("TechnologyType").toString(),"99")){
-            condition.put("TechnologyType",null);
+    public List<Supplier> getList(Map<String, Object> condition) {
+        if (ObjectUtil.isNotEmpty(condition.get("TechnologyType")) &&
+                StringUtil.equals(condition.get("TechnologyType").toString(), "99")) {
+            condition.put("TechnologyType", null);
             return baseMapper.getSumList(condition);
         }
         return baseMapper.getList(condition);
@@ -60,14 +60,15 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 列表条数
+     *
      * @param condition
      * @return
      */
     @Override
     public Integer getListCount(Map<String, Object> condition) {
-        if(ObjectUtil.isNotEmpty(condition.get("TechnologyType"))&&
-                StringUtil.equals(condition.get("TechnologyType").toString(),"99")){
-            condition.put("TechnologyType",null);
+        if (ObjectUtil.isNotEmpty(condition.get("TechnologyType")) &&
+                StringUtil.equals(condition.get("TechnologyType").toString(), "99")) {
+            condition.put("TechnologyType", null);
             return baseMapper.getSumListCount(condition);
         }
         return baseMapper.getListCount(condition);
@@ -75,14 +76,15 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 供应商采购列表
+     *
      * @param condition
      * @return
      */
     @Override
     public List<Supplier> getPurList(Map<String, Object> condition) {
-        if(ObjectUtil.isNotEmpty(condition.get("TechnologyType"))&&
-                StringUtil.equals(condition.get("TechnologyType").toString(),"99")){
-            condition.put("TechnologyType",null);
+        if (ObjectUtil.isNotEmpty(condition.get("TechnologyType")) &&
+                StringUtil.equals(condition.get("TechnologyType").toString(), "99")) {
+            condition.put("TechnologyType", null);
             return baseMapper.getSumList(condition);
         }
         return baseMapper.getPurList(condition);
@@ -90,14 +92,15 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 供应商采购列表条数
+     *
      * @param condition
      * @return
      */
     @Override
     public Integer getPurListCount(Map<String, Object> condition) {
-        if(ObjectUtil.isNotEmpty(condition.get("TechnologyType"))&&
-                StringUtil.equals(condition.get("TechnologyType").toString(),"99")){
-            condition.put("TechnologyType",null);
+        if (ObjectUtil.isNotEmpty(condition.get("TechnologyType")) &&
+                StringUtil.equals(condition.get("TechnologyType").toString(), "99")) {
+            condition.put("TechnologyType", null);
             return baseMapper.getSumListCount(condition);
         }
         return baseMapper.getPurListCount(condition);
@@ -105,21 +108,23 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 统计物料分类
+     *
      * @return
      */
     @Override
-    public List<Supplier> statisticsClassify(String Purpose,String search) {
-        if(StringUtil.equals("null",Purpose)){
+    public List<Supplier> statisticsClassify(String Purpose, String search) {
+        if (StringUtil.equals("null", Purpose)) {
             Purpose = null;
         }
-        if(StringUtil.equals("null",search)){
+        if (StringUtil.equals("null", search)) {
             search = null;
         }
-        return baseMapper.getGroupByCategory(Purpose,search);
+        return baseMapper.getGroupByCategory(Purpose, search);
     }
 
     /**
      * 添加
+     *
      * @param supplier
      */
     @Transactional(rollbackFor = Exception.class)
@@ -127,18 +132,18 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     public String add(Supplier supplier) {
         supplier.setCreatedTime(new Date());
         //生成code
-        if(StringUtil.isEmpty(supplier.getCode())){
-           Supplier sCode = getOne(Wrappers.<Supplier>query().lambda().orderByDesc(Supplier::getCode).last("limit 1"));
-           if(ObjectUtil.isEmpty(sCode)){
-               supplier.setCode("C001");
-           }else{
-               supplier.setCode(sCode.getCode()==null?"c001": CodeUtil.generateWmsCode(sCode.getCode()));
-           }
+        if (StringUtil.isEmpty(supplier.getCode())) {
+            Supplier sCode = getOne(Wrappers.<Supplier>query().lambda().orderByDesc(Supplier::getCode).last("limit 1"));
+            if (ObjectUtil.isEmpty(sCode)) {
+                supplier.setCode("C001");
+            } else {
+                supplier.setCode(sCode.getCode() == null ? "c001" : CodeUtil.generateWmsCode(sCode.getCode()));
+            }
         }
         save(supplier);
         List<StockAttachment> attr = supplier.getAttr();
-        if(CollectionUtil.isNotEmpty(attr)){
-            for(StockAttachment s:attr){
+        if (CollectionUtil.isNotEmpty(attr)) {
+            for (StockAttachment s : attr) {
                 s.setBusiId(supplier.getId());
                 s.setBusiType(AttachmentTypeEnum.TYPE_TWO.getKey());
                 s.setCreatedTime(new Date());
@@ -151,22 +156,23 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 修改
+     *
      * @param supplier
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean edit(Supplier supplier) {
-        if(StringUtil.isEmpty(supplier.getId())){
+        if (StringUtil.isEmpty(supplier.getId())) {
             throw new ServiceException("参数异常");
         }
         supplier.setUpdatedTime(new Date());
         updateById(supplier);
         List<StockAttachment> attr = supplier.getAttr();
-        if(CollectionUtil.isNotEmpty(attr)){
+        if (CollectionUtil.isNotEmpty(attr)) {
             //清空文件重新添加
-            stockAttachmentService.remove(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId,supplier.getId()));
-            for(StockAttachment s:attr){
+            stockAttachmentService.remove(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId, supplier.getId()));
+            for (StockAttachment s : attr) {
                 s.setBusiId(supplier.getId());
                 s.setBusiType(AttachmentTypeEnum.TYPE_TWO.getKey());
                 s.setCreatedTime(new Date());
@@ -178,22 +184,24 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 删除
+     *
      * @param supplier
      */
     @Override
     public void delete(Supplier supplier) {
         removeById(supplier.getId());
-        stockAttachmentService.remove(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId,supplier.getId()));
+        stockAttachmentService.remove(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId, supplier.getId()));
     }
 
     /**
      * 详情
+     *
      * @param id
      */
     @Override
     public Supplier detail(String id) {
         Supplier supplier = getById(id);
-        if(ObjectUtil.isNotEmpty(supplier)){
+        if (ObjectUtil.isNotEmpty(supplier)) {
             supplier.setAttr(stockAttachmentService.getListByBusi(id));
         }
         return supplier;
@@ -201,6 +209,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 供应商决策辅助详情
+     *
      * @param id
      * @return
      */
@@ -211,12 +220,13 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 供应商采购分析详情
+     *
      * @param id
      * @return
      */
     @Override
     public Map<String, Integer> getSuCount(String id) {
-        if(StringUtil.isEmpty(id)){
+        if (StringUtil.isEmpty(id)) {
             throw new ServiceException("参数异常");
         }
         Map<String, Integer> map = new HashMap<>();
@@ -227,21 +237,23 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 供应商采购物料分析
+     *
      * @param condition
      * @return
      */
     @Override
     public List<Supplier> spmAnalyse(Map<String, Object> condition) {
         List<Supplier> list = baseMapper.getSuPurMaterialAnalyse(condition);
-        for(Supplier s:list){
-            String sumMoney = s.getSumMoney().replace(",","");
-            s.setPurProportion(new BigDecimal(sumMoney).divide(s.getTotalMoney(),2,BigDecimal.ROUND_HALF_UP));
+        for (Supplier s : list) {
+            String sumMoney = s.getSumMoney().replace(",", "");
+            s.setPurProportion(new BigDecimal(sumMoney).divide(s.getTotalMoney(), 2, BigDecimal.ROUND_HALF_UP));
         }
         return list;
     }
 
     /**
      * 供应商采购物料分析
+     *
      * @param condition
      * @return
      */
@@ -253,43 +265,46 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 月度退货记录分析
+     *
      * @param id
      * @return
      */
     @Override
-    public List<Supplier> getBackSumMoneyAndCount(String id,String date) {
-        return baseMapper.getBackSumMoneyAndCount(id,date);
+    public List<Supplier> getBackSumMoneyAndCount(String id, String date) {
+        return baseMapper.getBackSumMoneyAndCount(id, date);
     }
 
     /**
      * 退货记录总数和总金额
+     *
      * @param id
      * @return
      */
     @Override
-    public Map<String, Object> getAllSumMoneyAndCount(String id,String date) {
-        return baseMapper.getAllSumMoneyAndCount(id,date);
+    public Map<String, Object> getAllSumMoneyAndCount(String id, String date) {
+        return baseMapper.getAllSumMoneyAndCount(id, date);
     }
 
     /**
      * 月度采购分析
+     *
      * @param id
      * @param date
      * @return
      */
     @Override
     public List<Supplier> getMonthSumPurMoney(String id, String date) {
-        List<Supplier> list = baseMapper.getMonthSumPurMoney(id,date);
+        List<Supplier> list = baseMapper.getMonthSumPurMoney(id, date);
         //统计出所有条数得总额
 //        BigDecimal totalMoney = list.stream()
 //                .map(Supplier::getMoney)
 //                .reduce(BigDecimal.ZERO,BigDecimal::add);
         BigDecimal totalMoney = purchaseContractService.getSumMoney(date);
-        for(Supplier s:list){
-            if(s.getMoney().compareTo(BigDecimal.ZERO)==0||totalMoney.compareTo(BigDecimal.ZERO)==0){
+        for (Supplier s : list) {
+            if (s.getMoney().compareTo(BigDecimal.ZERO) == 0 || totalMoney.compareTo(BigDecimal.ZERO) == 0) {
                 s.setPurProportion(BigDecimal.ZERO);
-            }else{
-                s.setPurProportion(s.getMoney().divide(totalMoney,2,BigDecimal.ROUND_HALF_UP));
+            } else {
+                s.setPurProportion(s.getMoney().divide(totalMoney, 2, BigDecimal.ROUND_HALF_UP));
             }
         }
         return list;
@@ -297,6 +312,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     /**
      * 下拉列表
+     *
      * @param condition
      * @return
      */
@@ -305,4 +321,75 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         return baseMapper.selectList(condition);
     }
 
+    @Override
+    public List<Map<String, Object>> getAccountDate() {
+        return listMaps(
+                Wrappers.<Supplier>query()
+                        .select("count(0) count", "AccountDate accountDate")
+                        .lambda()
+                        .orderByAsc(Supplier::getAccountDate)
+                        .groupBy(Supplier::getAccountDate)
+        );
+    }
+
+    @Override
+    public List<Map<String, Object>> getSafetyWarnDayList() {
+        List<Map<String, Object>> safetyWarnDayList = baseMapper.getSafetyWarnDayList();
+
+        /*
+        利用map与set去重供应商
+        key 天数type
+        value 供应商
+         */
+        Map<Integer, HashSet<String>> safetyWarnDayFactoryIdSet = safetyWarnDayList.stream().collect(Collectors.toMap(
+                item -> {
+                    int integer = Integer.parseInt(item.get("safetyWarnDay").toString());
+                    if (integer < 6) {
+                        return 1;
+                    }
+                    if (integer < 16) {
+                        return 2;
+                    }
+                    if (integer < 31) {
+                        return 3;
+                    }
+                    if (integer < 46) {
+                        return 4;
+                    }
+                    return 5;
+                },
+                item -> {
+                    HashSet<String> factoryIdSet = new HashSet<>();
+                    factoryIdSet.add(item.get("factoryId").toString());
+                    return factoryIdSet;
+                },
+                (v1, v2) -> {
+                    v1.addAll(v2);
+                    return v1;
+                }
+        ));
+
+        safetyWarnDayFactoryIdSet.putIfAbsent(1, new HashSet<>());
+        safetyWarnDayFactoryIdSet.putIfAbsent(2, new HashSet<>());
+        safetyWarnDayFactoryIdSet.putIfAbsent(3, new HashSet<>());
+        safetyWarnDayFactoryIdSet.putIfAbsent(4, new HashSet<>());
+        safetyWarnDayFactoryIdSet.putIfAbsent(5, new HashSet<>());
+
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        safetyWarnDayFactoryIdSet.forEach((k, v) -> {
+            HashMap<String, Object> map = new HashMap<>();
+
+            map.put("type", k);
+            map.put("count", v.size());
+            map.put("name", k == 1 ? "0~5天" : k == 2 ? "6~15天" : k == 3 ? "16~30天" : k == 4 ? "31~45天" : "45天以上");
+
+            result.add(map);
+        });
+
+        // 排序
+        return result.stream().sorted(Comparator.comparing(item -> Integer.valueOf(item.get("type").toString()))).collect(Collectors.toList());
+    }
+
 }

hx-service/syringe-production/src/main/java/com/fjhx/config/MybatisConfig.java

@@ -1,7 +1,10 @@
 package com.fjhx.config;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
@@ -43,6 +46,12 @@ public class MybatisConfig {
 
         }));
 
+        // 分页
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+
+        // 乐观锁
+        interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+
         return interceptor;
     }
 

hx-service/syringe-production/src/main/java/com/fjhx/service/tda/impl/TdaApplicationServiceImpl.java

@@ -77,7 +77,7 @@ public class TdaApplicationServiceImpl extends ServiceImpl<TdaApplicationMapper,
 
         // 华为ioDta删除资源空间
         TdaApplication tdaApplication = getById(id);
-        IoTDAUtil.deleteApplication(tdaApplication.getAppName());
+        IoTDAUtil.deleteApplication(tdaApplication.getAppId());
 
         removeById(id);
     }