Bladeren bron

入参map<String,Object> 改为map<String,String>

home 2 jaren geleden
bovenliggende
commit
0e6f4ed452
38 gewijzigde bestanden met toevoegingen van 457 en 32 verwijderingen
  1. 2 1
      .gitignore
  2. 123 0
      hx-api/storage-api/src/main/java/com/fjhx/entity/stock/StockWater.java
  3. 125 0
      hx-api/storage-api/src/main/java/com/fjhx/entity/u/UUser.java
  4. 17 0
      hx-api/storage-api/src/main/java/com/fjhx/params/stock/StockWaterEx.java
  5. 17 0
      hx-api/storage-api/src/main/java/com/fjhx/params/stock/StockWaterVo.java
  6. 17 0
      hx-api/storage-api/src/main/java/com/fjhx/params/u/UUserEx.java
  7. 17 0
      hx-api/storage-api/src/main/java/com/fjhx/params/u/UUserVo.java
  8. 1 1
      hx-common/code-generator/src/main/resources/codeTemplates/controller.java.vm
  9. 1 1
      hx-common/code-generator/src/main/resources/codeTemplates/service.java.vm
  10. 1 1
      hx-common/code-generator/src/main/resources/codeTemplates/serviceImpl.java.vm
  11. 4 4
      hx-common/hx-tool/src/main/java/com/fjhx/base/BaseService.java
  12. 3 3
      hx-common/hx-tool/src/main/java/com/fjhx/utils/WrapperUtil.java
  13. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/controller/BomController.java
  14. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/controller/BomDetailsController.java
  15. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/service/BomDetailsService.java
  16. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/service/BomService.java
  17. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/service/impl/BomDetailsServiceImpl.java
  18. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/bom/service/impl/BomServiceImpl.java
  19. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/classif/controller/ClassifController.java
  20. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/classif/service/ClassifService.java
  21. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/classif/service/impl/ClassifServiceImpl.java
  22. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/material/controller/MaterialController.java
  23. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/material/service/MaterialService.java
  24. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java
  25. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/product/controller/ProductController.java
  26. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/product/service/ProductService.java
  27. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java
  28. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/production/controller/ProductionLineController.java
  29. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/production/service/ProductionLineService.java
  30. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionLineServiceImpl.java
  31. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/workshop/controller/WorkshopController.java
  32. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/WorkshopService.java
  33. 1 1
      hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/impl/WorkshopServiceImpl.java
  34. 37 0
      hx-serve/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java
  35. 16 0
      hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java
  36. 5 0
      hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml
  37. 22 0
      hx-serve/storage/src/main/java/com/fjhx/stock/service/StockWaterService.java
  38. 28 0
      hx-serve/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

+ 2 - 1
.gitignore

@@ -2,4 +2,5 @@
 .idea
 target
 **/target
-hx-common/code-generator/src/main/java/com/fjhx/modular
+# 自动生成不提交
+hx-common/code-generator/src/main/java/com/fjhx/modular/**

+ 123 - 0
hx-api/storage-api/src/main/java/com/fjhx/entity/stock/StockWater.java

@@ -0,0 +1,123 @@
+package com.fjhx.entity.stock;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 出入库
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockWater extends BaseEntity {
+
+
+    /**
+     * 软删除
+     */
+    @TableField("IsDelete")
+    private Boolean isdelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date createdtime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date updatedtime;
+
+    /**
+     * 出入库编号
+     */
+    @TableField("WaterNo")
+    private String waterno;
+
+    /**
+     * 操作人
+     */
+    @TableField("OperUserId")
+    private String operuserid;
+
+    /**
+     * 关联编号 出/入库单编号
+     */
+    @TableField("LinkId")
+    private String linkid;
+
+    /**
+     * 合计数量
+     */
+    @TableField("TotalQty")
+    private BigDecimal totalqty;
+
+    /**
+     * 仓库ID
+     */
+    @TableField("StockHouseId")
+    private String stockhouseid;
+
+    /**
+     * 物料编号
+     */
+    @TableField("MaterialCode")
+    private String materialcode;
+
+    /**
+     * 出入库单类型 (枚举定义:1=采购入库,2=归还入库,10=领料出库,11=退货出库,12=报损出库,14=标签损坏入库,25=标签损坏出库)
+     */
+    @TableField("BillType")
+    private Integer billtype;
+
+    /**
+     * 库存变更类型 (枚举定义:6=库存初始化,10=入库,11=盘盈,12=数量添加修正,13=补入库,14=标签损坏入库,15=归还入库,16=现场回仓,17=调仓入库,20=出库,21=盘亏,22=数量减少修正,23=补出库,24=绑定错误,25=标签损坏出库,26=退货出库,27=报废出库,28=调仓出库)
+     */
+    @TableField("StockChangeType")
+    private Integer stockchangetype;
+
+    /**
+     * 备注
+     */
+    @TableField("Remark")
+    private String remark;
+
+    /**
+     * 原来库存数量
+     */
+    @TableField("OldQuantity")
+    private BigDecimal oldquantity;
+
+    /**
+     * 批次号
+     */
+    @TableField("BatchNo")
+    private String batchno;
+
+    /**
+     * 异常出库处理备注
+     */
+    @TableField("AbnormalOutRemark")
+    private String abnormaloutremark;
+
+    /**
+     * 异常出库是否已处理 (枚举定义:0=否,1=是)
+     */
+    @TableField("AbnormalOutState")
+    private Integer abnormaloutstate;
+
+
+}

+ 125 - 0
hx-api/storage-api/src/main/java/com/fjhx/entity/u/UUser.java

@@ -0,0 +1,125 @@
+package com.fjhx.entity.u;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 管理员
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+public class UUser {
+
+
+    /**
+     * 软删除
+     */
+    @TableField("IsDelete")
+    private Boolean isDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date createdTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date updatedTime;
+
+    /**
+     * 手机号码
+     */
+    @TableField("Mobile")
+    private String mobile;
+
+    /**
+     * 真实姓名
+     */
+    @TableField("RealName")
+    private String realName;
+
+    /**
+     * 部门ID
+     */
+    @TableField("DepartmentIDStr")
+    private String departmentIdStr;
+
+    /**
+     * 用户状态 是否离职
+     */
+    @TableField("IsQuit")
+    private Boolean isQuit;
+
+    /**
+     * 离职时间
+     */
+    @TableField("QuitTime")
+    private Date quitTime;
+
+    @TableField("IsSuperAdmin")
+    private Boolean isSuperAdmin;
+
+    /**
+     * 工号
+     */
+    @TableField("JobNo")
+    private String jobNo;
+
+    /**
+     * 身份证
+     */
+    @TableField("IDCard")
+    private String idCard;
+
+    /**
+     * 是否是负责人
+     */
+    @TableField("IsLeader")
+    private Boolean isLeader;
+
+    /**
+     * 人脸照片
+     */
+    @TableField("FaceImagUrl")
+    private String faceImagUrl;
+
+    /**
+     * 第三方人脸id
+     */
+    @TableField("FaceID")
+    private String faceId;
+
+    /**
+     * 用户状态 是否在线可接单
+     */
+    @TableField("IsOnLine")
+    private Boolean isOnLine;
+
+    /**
+     * 性别 (枚举定义:0=未知,1=男,2=女)
+     */
+    @TableField("SexCode")
+    private Integer sexCode;
+
+    /**
+     * 角色ID
+     */
+    @TableField("RoleKey")
+    private String roleKey;
+
+    /**
+     * 部门ID
+     */
+    @TableField("DepartmentID")
+    private String departmentId;
+    
+}

+ 17 - 0
hx-api/storage-api/src/main/java/com/fjhx/params/stock/StockWaterEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.StockWater;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 出入库
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockWaterEx extends StockWater {
+
+}

+ 17 - 0
hx-api/storage-api/src/main/java/com/fjhx/params/stock/StockWaterVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.StockWater;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 出入库
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockWaterVo extends StockWater {
+
+}

+ 17 - 0
hx-api/storage-api/src/main/java/com/fjhx/params/u/UUserEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.u;
+
+import com.fjhx.entity.u.UUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 管理员
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UUserEx extends UUser {
+
+}

+ 17 - 0
hx-api/storage-api/src/main/java/com/fjhx/params/u/UUserVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.u;
+
+import com.fjhx.entity.u.UUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 管理员
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UUserVo extends UUser {
+
+}

+ 1 - 1
hx-common/code-generator/src/main/resources/codeTemplates/controller.java.vm

@@ -48,7 +48,7 @@ public class ${table.controllerName} {
     private ${table.serviceName} ${table.entityPath}Service;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
+    public R page(@RequestBody Map<String, String> condition){
         Page<${entity}> result = ${table.entityPath}Service.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-common/code-generator/src/main/resources/codeTemplates/service.java.vm

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
 
-    Page<${entity}> getPage(Map<String, Object> condition);
+    Page<${entity}> getPage(Map<String, String> condition);
 
     void add(${entity}Vo ${table.entityPath}Vo);
 

+ 1 - 1
hx-common/code-generator/src/main/resources/codeTemplates/serviceImpl.java.vm

@@ -25,7 +25,7 @@ import java.util.Map;
 public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
 
     @Override
-    public Page<${entity}> getPage(Map<String, Object> condition) {
+    public Page<${entity}> getPage(Map<String, String> condition) {
 
         QueryWrapper<${entity}> wrapper = Wrappers.query();
 

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

@@ -28,10 +28,10 @@ public interface BaseService<T> extends IService<T> {
     /**
      * 获取分页
      */
-    default Page<T> createPage(Map<String, Object> condition) {
-        int pageNum = (condition.get("pageNum") == null || condition.get("pageNum") == "") ?
+    default Page<T> createPage(Map<String, String> condition) {
+        int pageNum = (condition.get("pageNum") == null || condition.get("pageNum").equals("")) ?
                 1 : Integer.parseInt(String.valueOf(condition.get("pageNum")));
-        int pageSize = (condition.get("pageSize") == null || condition.get("pageSize") == "") ?
+        int pageSize = (condition.get("pageSize") == null || condition.get("pageSize").equals("")) ?
                 10 : Integer.parseInt(String.valueOf(condition.get("pageSize")));
         return new Page<>(pageNum, pageSize);
     }
@@ -43,7 +43,7 @@ public interface BaseService<T> extends IService<T> {
      * @param queryWrapper wrapper
      * @return 分页后的对象
      */
-    default Page<T> page(Map<String, Object> condition, Wrapper<T> queryWrapper) {
+    default Page<T> page(Map<String, String> condition, Wrapper<T> queryWrapper) {
         Page<T> page = createPage(condition);
         return getBaseMapper().selectPage(page, queryWrapper);
     }

+ 3 - 3
hx-common/hx-tool/src/main/java/com/fjhx/utils/WrapperUtil.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 public class WrapperUtil {
 
-    private Map<String, Object> condition;
+    private Map<String, String> condition;
 
     private QueryWrapper<?> wrapper;
 
@@ -35,7 +35,7 @@ public class WrapperUtil {
      *
      * @param condition 查询条件
      */
-    public static WrapperUtil init(Map<String, Object> condition) {
+    public static WrapperUtil init(Map<String, String> condition) {
         WrapperUtil wrapperUtil = new WrapperUtil();
         wrapperUtil.wrapper = Wrappers.query();
         wrapperUtil.condition = condition;
@@ -47,7 +47,7 @@ public class WrapperUtil {
      *
      * @param condition 查询条件
      */
-    public static WrapperUtil init(Map<String, Object> condition, QueryWrapper<?> wrapper) {
+    public static WrapperUtil init(Map<String, String> condition, QueryWrapper<?> wrapper) {
         WrapperUtil wrapperUtil = new WrapperUtil();
         wrapperUtil.wrapper = wrapper;
         wrapperUtil.condition = condition;

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/controller/BomController.java

@@ -29,7 +29,7 @@ public class BomController {
     private BomService bomService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition) {
+    public R page(@RequestBody Map<String, String> condition) {
         Page<BomVo> result = bomService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/controller/BomDetailsController.java

@@ -29,7 +29,7 @@ public class BomDetailsController {
     private BomDetailsService bomDetailsService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
+    public R page(@RequestBody Map<String, String> condition){
         Page<BomDetails> result = bomDetailsService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/service/BomDetailsService.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface BomDetailsService extends BaseService<BomDetails> {
 
-    Page<BomDetails> getPage(Map<String, Object> condition);
+    Page<BomDetails> getPage(Map<String, String> condition);
 
     void add(BomDetailsVo bomDetailsVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/service/BomService.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface BomService extends BaseService<Bom> {
 
-    Page<BomVo> getPage(Map<String, Object> condition);
+    Page<BomVo> getPage(Map<String, String> condition);
 
     void add(BomVo bomVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/service/impl/BomDetailsServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.Map;
 public class BomDetailsServiceImpl extends ServiceImpl<BomDetailsMapper, BomDetails> implements BomDetailsService {
 
     @Override
-    public Page<BomDetails> getPage(Map<String, Object> condition) {
+    public Page<BomDetails> getPage(Map<String, String> condition) {
 
         QueryWrapper<BomDetails> wrapper = Wrappers.query();
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/bom/service/impl/BomServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Map;
 public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomService {
 
     @Override
-    public Page<BomVo> getPage(Map<String, Object> condition) {
+    public Page<BomVo> getPage(Map<String, String> condition) {
 
         QueryWrapper<?> wrapper = WrapperUtil.init(condition)
                 .eq("p.classif_id", "classifId") // 分类查询

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/classif/controller/ClassifController.java

@@ -29,7 +29,7 @@ public class ClassifController {
     private ClassifService classifService;
 
     @PostMapping("/tree")
-    public R page(@RequestBody Map<String, Object> condition) {
+    public R page(@RequestBody Map<String, String> condition) {
         List<Map<String,Object>> result = classifService.getTree(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/classif/service/ClassifService.java

@@ -25,7 +25,7 @@ public interface ClassifService extends BaseService<Classif> {
 
     Classif detail(ClassifVo classifVo);
 
-    List<Map<String, Object>> getTree(Map<String, Object> condition);
+    List<Map<String, Object>> getTree(Map<String, String> condition);
 
     /**
      * 获取 分类id 和 分类子级id 数组

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/classif/service/impl/ClassifServiceImpl.java

@@ -94,7 +94,7 @@ public class ClassifServiceImpl extends ServiceImpl<ClassifMapper, Classif> impl
     }
 
     @Override
-    public List<Map<String, Object>> getTree(Map<String, Object> condition) {
+    public List<Map<String, Object>> getTree(Map<String, String> condition) {
 
         Object type = condition.get("type");
         Assert.notEmpty(type, "分类类型不能为空");

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/material/controller/MaterialController.java

@@ -30,7 +30,7 @@ public class MaterialController {
     private MaterialService materialService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition) {
+    public R page(@RequestBody Map<String, String> condition) {
         Page<Material> result = materialService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/material/service/MaterialService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface MaterialService extends BaseService<Material> {
 
-    Page<Material> getPage(Map<String, Object> condition);
+    Page<Material> getPage(Map<String, String> condition);
 
     void add(MaterialVo materialVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java

@@ -43,7 +43,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     private final RedisLockClient redisLockClient;
 
     @Override
-    public Page<Material> getPage(Map<String, Object> condition) {
+    public Page<Material> getPage(Map<String, String> condition) {
 
         QueryWrapper<Material> wrapper = Wrappers.query();
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/product/controller/ProductController.java

@@ -30,7 +30,7 @@ public class ProductController {
     private ProductService productService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
+    public R page(@RequestBody Map<String, String> condition){
         Page<Product> result = productService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/product/service/ProductService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface ProductService extends BaseService<Product> {
 
-    Page<Product> getPage(Map<String, Object> condition);
+    Page<Product> getPage(Map<String, String> condition);
 
     void add(ProductVo productVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java

@@ -40,7 +40,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     private final RedisLockClient redisLockClient;
 
     @Override
-    public Page<Product> getPage(Map<String, Object> condition) {
+    public Page<Product> getPage(Map<String, String> condition) {
 
         QueryWrapper<Product> wrapper = Wrappers.query();
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/production/controller/ProductionLineController.java

@@ -30,7 +30,7 @@ public class ProductionLineController {
     private ProductionLineService productionLineService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition) {
+    public R page(@RequestBody Map<String, String> condition) {
         Page<ProductionLineEx> result = productionLineService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/production/service/ProductionLineService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface ProductionLineService extends BaseService<ProductionLine> {
 
-    Page<ProductionLineEx> getPage(Map<String, Object> condition);
+    Page<ProductionLineEx> getPage(Map<String, String> condition);
 
     void add(ProductionLineVo productionLineVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionLineServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.Map;
 public class ProductionLineServiceImpl extends ServiceImpl<ProductionLineMapper, ProductionLine> implements ProductionLineService {
 
     @Override
-    public Page<ProductionLineEx> getPage(Map<String, Object> condition) {
+    public Page<ProductionLineEx> getPage(Map<String, String> condition) {
         QueryWrapper<?> wrapper = WrapperUtil.init(condition)
                 .eq("pl.workshop_id", "workshopId") // 车间id
                 .eq("pl.status", "status") // 生产线状态

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/workshop/controller/WorkshopController.java

@@ -31,7 +31,7 @@ public class WorkshopController {
     private WorkshopService workshopService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition) {
+    public R page(@RequestBody Map<String, String> condition) {
         Page<WorkshopEx> result = workshopService.getPage(condition);
         return R.success(result);
     }

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/WorkshopService.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface WorkshopService extends BaseService<Workshop> {
 
-    Page<WorkshopEx> getPage(Map<String, Object> condition);
+    Page<WorkshopEx> getPage(Map<String, String> condition);
 
     void add(WorkshopVo workshopVo);
 

+ 1 - 1
hx-serve/iot-management/src/main/java/com/fjhx/workshop/service/impl/WorkshopServiceImpl.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 public class WorkshopServiceImpl extends ServiceImpl<WorkshopMapper, Workshop> implements WorkshopService {
 
     @Override
-    public Page<WorkshopEx> getPage(Map<String, Object> condition) {
+    public Page<WorkshopEx> getPage(Map<String, String> condition) {
 
         QueryWrapper<Workshop> wrapper = Wrappers.query();
 

+ 37 - 0
hx-serve/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java

@@ -0,0 +1,37 @@
+package com.fjhx.stock.controller;
+
+import com.fjhx.stock.service.StockWaterService;
+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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 出入库 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@RestController
+@RequestMapping("/stockWater")
+public class StockWaterController {
+
+    @Autowired
+    private StockWaterService stockWaterService;
+
+
+    @PostMapping("getPickingStatistics")
+    public R getPickingStatistics(@RequestBody Map<String, String> condition) {
+        Map<String, Object> result = stockWaterService.getPickingStatistics(condition);
+        return R.success(result);
+    }
+
+
+}
+

+ 16 - 0
hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.stock.mapper;
+
+import com.fjhx.entity.stock.StockWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 出入库 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+public interface StockWaterMapper extends BaseMapper<StockWater> {
+
+}

+ 5 - 0
hx-serve/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.stock.mapper.StockWaterMapper">
+
+</mapper>

+ 22 - 0
hx-serve/storage/src/main/java/com/fjhx/stock/service/StockWaterService.java

@@ -0,0 +1,22 @@
+package com.fjhx.stock.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.stock.StockWater;
+import com.fjhx.params.stock.StockWaterVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 出入库 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+public interface StockWaterService extends BaseService<StockWater> {
+
+    Map<String, Object> getPickingStatistics(Map<String, String> condition);
+
+}

+ 28 - 0
hx-serve/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -0,0 +1,28 @@
+package com.fjhx.stock.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.stock.StockWater;
+import com.fjhx.stock.mapper.StockWaterMapper;
+import com.fjhx.stock.service.StockWaterService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 出入库 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-04
+ */
+@Service
+public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWater> implements StockWaterService {
+
+    @Override
+    public Map<String, Object> getPickingStatistics(Map<String, String> condition) {
+        
+        return null;
+    }
+
+}