结构重构

hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -1,6 +1,5 @@
 package com.fjhx.base;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hx-service-api/storage-api/src/main/java/com/fjhx/entity/supplier/Supplier.java

@@ -1,20 +1,15 @@
 package com.fjhx.entity.supplier;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.base.BasicEntity;
 import com.fjhx.entity.attachment.StockAttachment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 供应商

hx-service-api/storage-api/src/main/java/com/fjhx/entity/supplier/SupplierPricechange.java

@@ -1,16 +1,13 @@
 package com.fjhx.entity.supplier;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.base.BasicEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 供应商价格变更记录

hx-service-api/storage-api/src/main/java/com/fjhx/entity/supplier/SupplierProblem.java

@@ -1,18 +1,13 @@
 package com.fjhx.entity.supplier;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.base.BasicEntity;
 import com.fjhx.entity.attachment.StockAttachment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * <p>
  * 供应商面料问题反馈表

hx-service/storage/pom.xml

@@ -27,10 +27,12 @@
             <groupId>com.fjhx</groupId>
             <artifactId>storage-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>

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

@@ -1,9 +1,9 @@
 package com.fjhx.supplier.controller;
 
-import com.fjhx.base.ListPageMap;
-import org.springblade.core.tool.api.R;
 import com.fjhx.entity.supplier.Supplier;
 import com.fjhx.supplier.service.SupplierService;
+import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,11 +27,12 @@ public class SupplierController {
 
     /**
      * 列表
+     *
      * @param condition
      * @return
      */
     @PostMapping("/list")
-    public R list(@RequestBody Map<String, Object> condition){
+    public R list(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         List<Supplier> result = supplierService.getList(condition);
         return R.success(result);
@@ -39,11 +40,12 @@ public class SupplierController {
 
     /**
      * 列表条数
+     *
      * @param condition
      * @return
      */
     @PostMapping("/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition){
+    public R listCount(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         Integer count = supplierService.getListCount(condition);
         return R.success(count);
@@ -51,11 +53,12 @@ public class SupplierController {
 
     /**
      * 供应商采购列表
+     *
      * @param condition
      * @return
      */
     @PostMapping("/purchase/list")
-    public R purchaseList(@RequestBody Map<String, Object> condition){
+    public R purchaseList(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         List<Supplier> result = supplierService.getPurList(condition);
         return R.success(result);
@@ -63,97 +66,107 @@ public class SupplierController {
 
     /**
      * 供应商采购列表条数
+     *
      * @param condition
      * @return
      */
     @PostMapping("/purchase/list/count")
-    public R purchaseListCount(@RequestBody Map<String, Object> condition){
+    public R purchaseListCount(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         Integer count = supplierService.getPurListCount(condition);
         return R.success(count);
     }
+
     /**
      * 统计物料分类
+     *
      * @return
      */
     @GetMapping("/statisticsClassify")
-    public R statisticsClassify(@RequestParam(required = false)String Purpose ,
-                                @RequestParam(required = false)String search){
-        List<Supplier> list = supplierService.statisticsClassify(Purpose,search);
+    public R statisticsClassify(@RequestParam(required = false) String Purpose,
+                                @RequestParam(required = false) String search) {
+        List<Supplier> list = supplierService.statisticsClassify(Purpose, search);
         return R.success(list);
     }
 
     /**
      * 添加
+     *
      * @param supplier
      * @return
      */
     @PostMapping("/add")
-    public R add(@RequestBody Supplier supplier){
+    public R add(@RequestBody Supplier supplier) {
         supplierService.add(supplier);
         return R.success();
     }
 
     /**
      * 修改
+     *
      * @param supplier
      * @return
      */
     @PostMapping("/edit")
-    public R edit(@RequestBody Supplier supplier){
+    public R edit(@RequestBody Supplier supplier) {
         supplierService.edit(supplier);
         return R.success();
     }
 
     /**
      * 删除
+     *
      * @param supplier
      * @return
      */
     @PostMapping("/delete")
-    public R delete(@RequestBody Supplier supplier){
+    public R delete(@RequestBody Supplier supplier) {
         supplierService.delete(supplier);
         return R.success();
     }
 
     /**
      * 详情
+     *
      * @param id
      * @return
      */
     @GetMapping("/detail")
-    public R detail(@RequestParam("id")String id){
+    public R detail(@RequestParam("id") String id) {
         return R.success(supplierService.detail(id));
     }
 
     /**
      * 供应商决策辅助详情
+     *
      * @param id
      * @return
      */
     @GetMapping("/su/detail")
-    public R suDetail(@RequestParam("id")String id){
+    public R suDetail(@RequestParam("id") String id) {
         return R.success(supplierService.getSuById(id));
     }
 
     /**
      * 供应商采购分析详情
+     *
      * @param id
      * @return
      */
     @GetMapping("/su/count")
-    public R suCount(@RequestParam("id")String id){
+    public R suCount(@RequestParam("id") String id) {
         return R.success(supplierService.getSuCount(id));
     }
 
 
     /**
      * 列表
+     *
      * @param condition
      * @return
      */
     @PostMapping("/su/spmAnalyse")
-    public R suSpmAnalyse(@RequestBody Map<String, Object> condition){
+    public R suSpmAnalyse(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         List<Supplier> result = supplierService.spmAnalyse(condition);
         return R.success(result);
@@ -161,11 +174,12 @@ public class SupplierController {
 
     /**
      * 列表条数
+     *
      * @param condition
      * @return
      */
     @PostMapping("/su/spmAnalyse/count")
-    public R suSpmAnalyseCount(@RequestBody Map<String, Object> condition){
+    public R suSpmAnalyseCount(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         Integer count = supplierService.spmAnalyseCount(condition);
         return R.success(count);
@@ -173,42 +187,48 @@ public class SupplierController {
 
     /**
      * 月度退货记录
+     *
      * @param id
      * @return
      */
     @GetMapping("/month/getSum")
-    public R monthGetSum(@RequestParam("id")String id,@RequestParam("date")String date){
-        List<Supplier> list = supplierService.getBackSumMoneyAndCount(id,date);
+    public R monthGetSum(@RequestParam("id") String id, @RequestParam("date") String date) {
+        List<Supplier> list = supplierService.getBackSumMoneyAndCount(id, date);
         return R.success(list);
     }
 
     /**
      * 退货记录总数和总金额
+     *
      * @param id
      * @return
      */
     @GetMapping("/back/sum")
-    public R backSum(@RequestParam("id")String id,@RequestParam("date")String date){
-        Map<String,Object> map = supplierService.getAllSumMoneyAndCount(id,date);
+    public R backSum(@RequestParam("id") String id, @RequestParam("date") String date) {
+        Map<String, Object> map = supplierService.getAllSumMoneyAndCount(id, date);
         return R.success(map);
     }
+
     /**
      * 月度采购金额统计
+     *
      * @param id
      * @return
      */
     @GetMapping("/purchase/month/sum")
-    public R purchaseSum(@RequestParam("id")String id,@RequestParam("date")String date){
-        List<Supplier> list = supplierService.getMonthSumPurMoney(id,date);
+    public R purchaseSum(@RequestParam("id") String id, @RequestParam("date") String date) {
+        List<Supplier> list = supplierService.getMonthSumPurMoney(id, date);
         return R.success(list);
     }
+
     /**
      * 下拉供应商
+     *
      * @param condition
      * @return
      */
     @PostMapping("/selectList")
-    public R selectList(@RequestBody Map<String, Object> condition){
+    public R selectList(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         List<Supplier> list = supplierService.selectList(condition);
         return R.success(list);

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

@@ -1,9 +1,9 @@
 package com.fjhx.supplier.controller;
 
-import com.fjhx.base.ListPageMap;
-import org.springblade.core.tool.api.R;
 import com.fjhx.entity.supplier.SupplierPricechange;
 import com.fjhx.supplier.service.SupplierPricechangeService;
+import org.springblade.common.utils.ListPageMap;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,11 +30,12 @@ public class SupplierPricechangeController {
 
     /**
      * 列表
+     *
      * @param condition
      * @return
      */
     @PostMapping("/su/list")
-    public R list(@RequestBody Map<String, Object> condition){
+    public R list(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         List<SupplierPricechange> result = supplierPricechangeService.getListBySupplierId(condition);
         return R.success(result);
@@ -42,11 +43,12 @@ public class SupplierPricechangeController {
 
     /**
      * 列表条数
+     *
      * @param condition
      * @return
      */
     @PostMapping("/su/list/count")
-    public R listCount(@RequestBody Map<String, Object> condition){
+    public R listCount(@RequestBody Map<String, Object> condition) {
         ListPageMap.getListPageMap(condition);
         Integer count = supplierPricechangeService.getListCountBySupplierId(condition);
         return R.success(count);

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

@@ -1,8 +1,7 @@
 package com.fjhx.supplier.service;
 
-import com.fjhx.entity.supplier.Supplier;
-import com.fjhx.entity.supplier.SupplierPricechange;
 import com.fjhx.base.BaseService;
+import com.fjhx.entity.supplier.SupplierPricechange;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,11 +1,8 @@
 package com.fjhx.supplier.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.supplier.Supplier;
-import com.fjhx.params.supplier.SupplierVo;
 import com.fjhx.base.BaseService;
+import com.fjhx.entity.supplier.Supplier;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -54,12 +51,14 @@ public interface SupplierService extends BaseService<Supplier> {
 
     /**
      * 统计物料分类
+     *
      * @return
      */
-    List<Supplier> statisticsClassify(String Purpose,String search);
+    List<Supplier> statisticsClassify(String Purpose, String search);
 
     /**
      * 添加
+     *
      * @param supplier
      * @return
      */
@@ -67,6 +66,7 @@ public interface SupplierService extends BaseService<Supplier> {
 
     /**
      * 修改
+     *
      * @param supplier
      * @return
      */
@@ -74,31 +74,36 @@ public interface SupplierService extends BaseService<Supplier> {
 
     /**
      * 删除
+     *
      * @param supplier
      */
     void delete(Supplier supplier);
 
     /**
      * 详情
+     *
      * @param id
      */
     Supplier detail(String id);
 
     /**
      * 供应商决策辅助详情
+     *
      * @param id
      */
     Supplier getSuById(String id);
 
     /**
      * 供应商采购分析详情
+     *
      * @param id
      * @return
      */
-    Map<String,Integer> getSuCount(String id);
+    Map<String, Integer> getSuCount(String id);
 
     /**
      * 供应商采购物料分析 列表
+     *
      * @param condition
      * @return
      */
@@ -106,6 +111,7 @@ public interface SupplierService extends BaseService<Supplier> {
 
     /**
      * 供应商采购物料分析 列表
+     *
      * @param condition
      * @return
      */
@@ -113,25 +119,28 @@ public interface SupplierService extends BaseService<Supplier> {
 
     /**
      * 月度退货记录分析
+     *
      * @param id
      * @return
      */
-    List<Supplier> getBackSumMoneyAndCount(String id,String date);
+    List<Supplier> getBackSumMoneyAndCount(String id, String date);
 
     /**
      * 退货记录总数和总金额
+     *
      * @param id
      * @return
      */
-    Map<String,Object> getAllSumMoneyAndCount(String id,String date);
+    Map<String, Object> getAllSumMoneyAndCount(String id, String date);
 
     /**
      * 月度采购分析
+     *
      * @param id
      * @param date
      * @return
      */
-    List<Supplier> getMonthSumPurMoney(String id,String date);
+    List<Supplier> getMonthSumPurMoney(String id, String date);
 
     /**
      * 下拉列表

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

@@ -11,10 +11,9 @@ import com.fjhx.entity.supplier.SupplierProblem;
 import com.fjhx.params.supplier.SupplierProblemVo;
 import com.fjhx.supplier.mapper.SupplierProblemMapper;
 import com.fjhx.supplier.service.SupplierProblemService;
-import com.fjhx.utils.ListUtil;
 import com.fjhx.utils.WrapperUtil;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.common.utils.ListUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;

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

@@ -5,11 +5,11 @@ 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.utils.CodeUtil;
 import com.fjhx.entity.supplier.Supplier;
 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;
 import org.springblade.core.tool.utils.ObjectUtil;