更新了ResponseResult返回类的相关代码

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProductExceptionEnum.java

@@ -26,6 +26,11 @@ public enum ProductExceptionEnum implements IExceptionEnum {
     PRODUCT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "产品信息不存在"),
 
     /**
+     * 号型信息不存在
+     */
+    SIZE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "号型信息不存在"),
+
+    /**
      * 产品信息不存在
      */
     PRODUCT_SKU_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "号型不存在"),

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java

@@ -30,10 +30,7 @@ public class Policeman implements Serializable {
     private String cabinetBoxId;
 
     @TableField(value = "org_id_int")
-    private Long orgIdInt;
-
-    @TableField(value = "org_id")
-    private String orgId;
+    private Long orgId;
 
     @TableField(value = "department_id")
     private Long departmentId;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.req.EquipmentSizeReq;
 import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
 import com.junmp.jyzb.api.util.GenCodeUtil;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.Product;
@@ -14,6 +15,7 @@ import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
+import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -202,8 +204,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
     @Override
     public EquipmentSize getOneSize(EquipmentSizeReq req) {
-        LambdaQueryWrapper<EquipmentSize> wrapper = createWrapperById(req);
-        return null;
+        //LambdaQueryWrapper<EquipmentSize> wrapper = createWrapperById(req);
+        return this.getById(req);
     }
 
     private LambdaQueryWrapper<EquipmentSize> createWrapperById(EquipmentSizeReq req) {
@@ -212,29 +214,59 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
             return wrapper;
         }
         //根据id编码查询
-//        wrapper.eq(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
-//
-//        wrapper.orderByDesc(Product::getCreateTime);
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), EquipmentSize::getId, req.getId());
+
+        wrapper.orderByDesc(EquipmentSize::getCreateTime);
         return wrapper;
     }
 
     @Override
-    public boolean deleteSize(EquipmentSizeReq msg) {
-        return false;
+    public boolean deleteSize(EquipmentSizeReq req) {
+        EquipmentSize size = querySize(req);
+        this.removeById(req.getId());
+        return true;
     }
 
     @Override
-    public boolean updateSize(EquipmentSizeReq msg) {
-        return false;
+    public boolean updateSize(EquipmentSizeReq req) {
+        EquipmentSize size = this.querySize(req);
+        BeanPlusUtil.copyProperties(req, size);
+        return this.updateById(size);
     }
 
     @Override
-    public boolean changeSizeState(EquipmentSizeReq msg) {
-        return false;
+    public boolean changeSizeState(EquipmentSizeReq req) {
+        EquipmentSize size = this.querySize(req);
+        BeanPlusUtil.copyProperties(req, size);
+        return this.updateById(size);
     }
 
     @Override
-    public List<EquipmentSize> getAllSize(EquipmentSizeReq msg) {
-        return null;
+    public List<EquipmentSize> getAllSize(EquipmentSizeReq req) {
+        LambdaQueryWrapper<EquipmentSize> wrapper = createWrapper(req);
+        return this.list(wrapper);
+    }
+
+    private EquipmentSize querySize(EquipmentSizeReq req) {
+        EquipmentSize app = this.getById(req.getId());
+
+        if (ObjectUtil.isNull(app)) {
+            throw new ServiceException(ProductExceptionEnum.SIZE_NOT_EXIST);
+        }
+        return app;
+    }
+
+    private LambdaQueryWrapper<EquipmentSize> createWrapper(EquipmentSizeReq req) {
+        LambdaQueryWrapper<EquipmentSize> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据业务编码查询
+        wrapper.like(ObjectUtil.isNotEmpty(req.getTypeId()), EquipmentSize::getTypeId, req.getTypeId());
+        //根据名称模糊查询
+        wrapper.like(ObjectUtil.isNotEmpty(req.getName()), EquipmentSize::getName, req.getName());
+
+        wrapper.orderByDesc(EquipmentSize::getCreateTime);
+        return wrapper;
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -12,6 +12,7 @@ import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.utils.*;
+import com.sun.jna.platform.win32.WinDef;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -105,7 +106,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         police.setUpdateTime(currentDate);
         police.setId(uuid);
 
-        police.setOrgId((String) policeman.get("orgId"));
+        police.setOrgId((Long) policeman.get("orgId"));
         police.setName((String) policeman.get("name"));
         police.setPoliceCode((String) policeman.get("policeCode"));
         police.setSex((String) policeman.get("sex"));
@@ -243,7 +244,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         //police.setId(uuid);
         String id = policeman.get("id").toString();
         police.setId(id);
-        police.setOrgId((String) policeman.get("orgId"));
+        police.setOrgId((Long) policeman.get("orgId"));
         police.setName((String) policeman.get("name"));
         police.setPoliceCode((String) policeman.get("policeCode"));
         police.setSex((String) policeman.get("sex"));

jyzb-biz/src/main/java/com/junmp/jyzb/utils/ResponseResult.java

 package com.junmp.jyzb.utils;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
 
 import java.time.Instant;
 
 /**
  * 定义统一的返回类
  * */
-
+@Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseResult<T> {
 
@@ -63,6 +64,18 @@ public class ResponseResult<T> {
         return data;
     }
 
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
     public void setData(T data) {
         this.data = data;
     }

pom.xml

@@ -13,7 +13,7 @@
         <module>jyzb-api</module>
         <module>jyzb-boot</module>
         <module>jyzb-biz</module>
-        <module>jyzb-process</module>
+<!--        <module>jyzb-process</module>-->
         <module>jyzb-common</module>
         <module>jyzb-mq</module>
     </modules>