Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java

 package com.junmp.jyzb.api.bean.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
 import lombok.Data;
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/CabinetLogsRecordReq.java

@@ -17,7 +17,7 @@ public class CabinetLogsRecordReq {
     private Date createTime;
     private String equipmentList;
     private List<SummaryLogReq> outInLogList;
-    private List<EquipmentSumreq> equipmentSum;
+    private List<EquipmentSumReq> equipmentSum;
 
 
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/DetailJsonReq.java

@@ -3,7 +3,6 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class DetailJsonReq {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/EquipmentSumreq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/EquipmentSumReq.java

@@ -3,11 +3,12 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 import lombok.Data;
 
 @Data
-public class EquipmentSumreq {
+public class EquipmentSumReq {
     private Integer outNum;
     private Integer inNum;
     private String sizeId;
     private String sizeName;
     private String typpeId;
     private String typeName;
+    private Integer num;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/PurchaseEqsReq.java

@@ -3,7 +3,6 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 public class PurchaseEqsReq {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryEquipmentTypeReq.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -19,5 +20,6 @@ public class QueryEquipmentTypeReq  {
     private String searchType;
     private String typeName;
     private String nickName;
+    private Date updateTime;
 }
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderDetailReq.java

 package com.junmp.jyzb.api.bean.req;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
-import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePoliceEquipmentReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.EquipmentSumReq;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UpdatePoliceEquipmentReq {
+    private Long orgId;
+    private String orgName;
+    private String policeId;
+    private String policeName;
+    private Integer totalNum;
+    private Integer InNum;
+    private Integer outNum;
+    private List<String> epcList;
+    private EquipmentSumReq equipmentSum;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java

@@ -41,4 +41,8 @@ public interface JYZBConstant {
      */
     String JYZB_ONLINE_PREFIX = "onlineState:";
     String JYZB_JWT_KEY = "JWT";
+
+//    String MINIO_ENDPOINT="http://192.168.3.121:9090";
+//    String MINIO_ACCESS_KEY="admin";
+//    String MINIO_SECRET_KEY="12345678";
 }

jyzb-biz/pom.xml

@@ -147,5 +147,15 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>3.0.10</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
     </dependencies>
 </project>

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java

@@ -110,5 +110,10 @@ public class EquipmentTypeController {
         return ApiRes.success(equipmentTypeService.alignTypeInfo(req));
     }
 
+    @PostMapping(path = "/exportSizeAndType",name = "导出指定时间后的类型号型#logThpe=30")
+    @ApiOperation("导出指定时间后的类型号型")
+    public ApiRes<String> exportSizeAndType(@RequestBody QueryEquipmentTypeReq req){
+        return ApiRes.success(equipmentTypeService.exportSizeAndType(req));
+    }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java

@@ -312,11 +312,13 @@ public class InventoryController {
         return ApiRes.success(inventoryService.alignInventoryInfo(req));
     }
 
-    @PostMapping(path = "/EqsImport",name = "装备导入")
+    @PostMapping(path = "/EqsImport",name = "装备导入#logType=30")
     @ApiOperation("装备导入")
     public ApiRes<Boolean> EqsImport(@RequestBody InventoryReq req){
         return ApiRes.success(inventoryService.EqsImport(req));
     }
 
 
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java

@@ -3,16 +3,13 @@ package com.junmp.jyzb.controller;
 import com.junmp.jyzb.api.bean.dto.LogDetailDto;
 import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
 import com.junmp.jyzb.api.bean.dto.OrderLogDto;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.LogSummarySecondReq;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.LogDetailReq;
 import com.junmp.jyzb.api.bean.query.LogSummaryReq;
 import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
-import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceEquipmentReq;
 import com.junmp.jyzb.entity.LogDetail;
 import com.junmp.jyzb.entity.LogSummary;
-import com.junmp.jyzb.entity.LogSummarySecond;
 import com.junmp.jyzb.service.*;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -50,6 +47,9 @@ public class OutAndInboundController {
     @Resource
     private InventoryService inventoryService;
 
+    @Resource
+    private PoliceEquipmentService policeEquipmentService;
+
     @ApiOperation("/查看出入库详情")
     @PostMapping(path="/GetDetailByLogSumId",name="查看出入库详情#enable")
     public ApiRes<List<LogDetailDto>> GetDetailByLogSumId(@RequestBody @Validated(ValidationApi.detail.class) LogDetailReq req){
@@ -104,11 +104,11 @@ public class OutAndInboundController {
         return ApiRes.success(orderLogService.getSecondInfoByLogSumId(req));
     }
 
-//    @PostMapping(path = "bind",name = "装备绑定或解绑#enable")
-//    @ApiOperation("装备绑定或者解绑")
-//    public ApiRes<Boolean> bind (){
-//        return ApiRes.success(inventoryService.bind());
-//    }
+    @PostMapping(path = "bind",name = "装备绑定或解绑#enable")
+    @ApiOperation("装备绑定或者解绑")
+    public ApiRes<Boolean> bind (@RequestBody UpdatePoliceEquipmentReq req){
+        return ApiRes.success(policeEquipmentService.bind(req));
+    }
 
 
 }

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

 package com.junmp.jyzb.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

+package com.junmp.jyzb.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SizeAndType {
+    private List<EquipmentType> typeList;
+    private List<EquipmentSize> sizeList;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/CabinetLogReceiver.java

@@ -2,7 +2,6 @@ package com.junmp.jyzb.rabbitmq;
 
 import com.alibaba.fastjson.JSON;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
-import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.service.InventorySummaryService;
 import com.junmp.v2.log.api.LogRecordApi;
 import com.junmp.v2.log.api.bean.dto.LogRecordDto;
@@ -10,7 +9,6 @@ import com.junmp.v2.log.api.constant.LogConstant;
 import com.junmp.v2.log.api.enums.LogTypeEnum;
 import com.junmp.v2.log.api.factory.LogRecordFactory;
 import com.rabbitmq.client.Channel;
-import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.messaging.handler.annotation.Header;
@@ -18,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.sql.Time;
 
 /**
  * 单警柜出入库记录上报并且记录到数据库中

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsByCabinetReceiver.java

@@ -2,7 +2,6 @@ package com.junmp.jyzb.rabbitmq;
 
 import com.alibaba.fastjson.JSON;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.service.LogSummaryService;
 import com.junmp.v2.log.api.LogRecordApi;
 import com.junmp.v2.log.api.bean.dto.LogRecordDto;

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsReceiver.java

@@ -3,7 +3,6 @@ package com.junmp.jyzb.rabbitmq;
 import com.alibaba.fastjson.JSON;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.service.LogSummaryService;
-import com.junmp.jyzb.service.OrderMainService;
 import com.junmp.v2.log.api.LogRecordApi;
 import com.junmp.v2.log.api.bean.dto.LogRecordDto;
 import com.junmp.v2.log.api.constant.LogConstant;

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java

@@ -32,4 +32,6 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
     List<EquipmentTreeDto> GetTypeTree(QueryEquipmentTypeReq req);
 
     List<TypeDto> alignTypeInfo(UpdateEquipmentTypeReq req);
+
+    String exportSizeAndType(QueryEquipmentTypeReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java

@@ -89,4 +89,5 @@ public interface InventoryService extends IService<Inventory> {
     List<EquipmentDto> alignInventoryInfo(InventoryReq req);
 
     boolean EqsImport(InventoryReq req);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/LogSummarySecondService.java

 package com.junmp.jyzb.service;
 
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.LogSummarySecondReq;
 import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
 import com.junmp.jyzb.entity.LogSummarySecond;
 import com.baomidou.mybatisplus.extension.service.IService;

jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderMainService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.OrderDto;
 import com.junmp.jyzb.api.bean.dto.OrderMainDto;
 import com.junmp.jyzb.api.bean.dto.ProcessOrderDto;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.api.bean.query.OrderMainReq;
 import com.junmp.jyzb.api.bean.query.OrderUploadReq;
 import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;

jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceEquipmentService.java

 package com.junmp.jyzb.service;
 
 import com.junmp.jyzb.api.bean.req.FormEqsReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceEquipmentReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface PoliceEquipmentService extends IService<PoliceEquipment> {
 
 
+    boolean bind(UpdatePoliceEquipmentReq req);
 }

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

@@ -45,7 +45,8 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
     }
     public Application GetOne(ApplicationReq req) {
         LambdaQueryWrapper<Application> wrapper = createWrapper(req);
-        return getOne(wrapper);
+        Application one = getOne(wrapper);
+        return ObjectUtil.isNull(one)?new Application():one;
     }
 
     //新增应用信息

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,10 +26,18 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -452,6 +461,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         return equipmentTypeMapper.alignTypeInfo(date);
     }
 
+
+
     private  EquipmentTreeDto convertNode(EquipmentType entity, List<EquipmentType> entityList,Integer type) {
         EquipmentTreeDto dto = new EquipmentTreeDto();
         BeanPlusUtil.copyProperties(entity,dto);
@@ -491,6 +502,35 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             return wrapper;
 
     }
+
+    @Override
+    public String exportSizeAndType(QueryEquipmentTypeReq req) {
+        List<EquipmentType> typeList = list(new LambdaQueryWrapper<EquipmentType>().ge(EquipmentType::getUpdateTime, req.getUpdateTime()));
+        SizeAndType sizeAndType = new SizeAndType();
+        sizeAndType.setTypeList(CollectionUtil.isNotEmpty(typeList)?typeList:new ArrayList<>());
+        List<EquipmentSize> sizeList = equipmentSizeService.list(new LambdaQueryWrapper<EquipmentSize>().ge(EquipmentSize::getUpdateTime, req.getUpdateTime()));
+        sizeAndType.setSizeList(CollectionUtil.isNotEmpty(sizeList)?sizeList:new ArrayList<>());
+        String jsonString = JSONObject.toJSONString(sizeAndType);
+
+        try {
+            byte[] byKey = Arrays.copyOf("junmp888".getBytes(StandardCharsets.UTF_8), 8);
+            byte[] iv = { (byte)0x12, (byte)0x34, (byte)0x56, (byte)0x78, (byte)0x90, (byte)0xAB, (byte)0xCD, (byte)0xEF };
+
+            SecretKeySpec secretKeySpec = new SecretKeySpec(byKey, "DES");
+            IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
+
+            Cipher desCipher = Cipher.getInstance("DES/CBC/NoPadding");
+            desCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
+
+            byte[] inputByteArray = jsonString.getBytes(StandardCharsets.UTF_8);
+            byte[] encryptedBytes = desCipher.doFinal(inputByteArray);
+
+            return Base64.getEncoder().encodeToString(encryptedBytes);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
 }
 
 

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

@@ -5,15 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
-import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
-import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
-import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
@@ -26,16 +22,13 @@ import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
-import liquibase.pro.packaged.L;
 import org.springframework.stereotype.Service;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMapper, InventorySummary> implements InventorySummaryService {

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

@@ -3,8 +3,6 @@ package com.junmp.jyzb.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.LogSummarySecondReq;
 import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
 import com.junmp.jyzb.entity.LogSummarySecond;
 import com.junmp.jyzb.service.LogSummarySecondService;

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

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.*;
 import com.junmp.jyzb.api.bean.query.LogSummaryReq;
 import com.junmp.jyzb.entity.*;
@@ -24,15 +23,12 @@ import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
 import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
 import com.junmp.v2.file.biz.service.SysFileInfoService;
-import liquibase.pro.packaged.S;
-import liquibase.pro.packaged.W;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.File;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -239,9 +235,9 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
 
         return a && b && c && c1 && d;
     }
-
     @Override
     public Boolean processOutInRecords(CabinetLogsRecordReq req) {
+        //根据单警柜
         return null;
     }
 

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

@@ -15,7 +15,6 @@ import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.query.*;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
-import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.api.bean.vo.InOrderInfo;
@@ -57,7 +56,6 @@ import org.springframework.amqp.core.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.req.FormEqsReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceEquipmentReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.service.PoliceEquipmentService;
 import com.junmp.jyzb.mapper.PoliceEquipmentMapper;
@@ -23,6 +24,11 @@ public class PoliceEquipmentServiceImpl extends ServiceImpl<PoliceEquipmentMappe
     private PolicemanService policemanService;
 
 
+    @Override
+    public boolean bind(UpdatePoliceEquipmentReq req) {
+
+        return false;
+    }
 }
 
 

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

+package com.junmp.jyzb.utils;
+import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.engines.DESedeEngine;
+import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.util.encoders.Base64;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESedeKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+import java.security.spec.KeySpec;
+
+public class EncryptionUtils {
+    private static final String ENCRYPTION_ALGORITHM = "DESede";
+    private static final String ENCRYPTION_KEY = "junmp";
+
+    //Des加密
+    public static String encryptDES(String message) throws Exception {
+        byte[] keyBytes = ENCRYPTION_KEY.getBytes(StandardCharsets.UTF_8);
+        KeySpec keySpec = new DESedeKeySpec(keyBytes);
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(ENCRYPTION_ALGORITHM);
+        Key key = keyFactory.generateSecret(keySpec);
+
+        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new DESedeEngine());
+        CipherParameters cipherParameters = new KeyParameter(key.getEncoded());
+
+        cipher.init(true, cipherParameters);
+
+        byte[] plaintext = message.getBytes(StandardCharsets.UTF_8);
+        byte[] ciphertext = new byte[cipher.getOutputSize(plaintext.length)];
+        int encryptedLength = cipher.processBytes(plaintext, 0, plaintext.length, ciphertext, 0);
+        cipher.doFinal(ciphertext, encryptedLength);
+
+        return new String(Base64.encode(ciphertext), StandardCharsets.UTF_8);
+    }
+}
\ No newline at end of file

jyzb-boot/src/main/java/com/junmp/jyzb/boot/JyzbBootApplication.java

@@ -34,6 +34,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
         JpDataSourceAutoConfiguration.class})
 public class JyzbBootApplication extends SpringBootServletInitializer {
 
+
+
     public static void main(String[] args) {
         SpringApplication.run(JyzbBootApplication.class, args);
     }
@@ -54,4 +56,6 @@ public class JyzbBootApplication extends SpringBootServletInitializer {
             }
         };
     }
+
+
 }

jyzb-boot/src/main/resources/application.yml

@@ -35,8 +35,8 @@ spring:
     active: local
   servlet:
     multipart:
-      max-request-size: 200MB
-      max-file-size: 200MB
+      max-request-size: 500MB
+      max-file-size: 500MB
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
@@ -72,3 +72,5 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*Mapper.xml
 
 
+
+

pom.xml

@@ -342,6 +342,15 @@
                 <artifactId>file-biz</artifactId>
                 <version>${junmp.v2.version}</version>
             </dependency>
+
+
+                <!-- 其他依赖... -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>1.70</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>