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/CabinetBoxDto.java

@@ -52,4 +52,11 @@ public class CabinetBoxDto implements Serializable {
     @ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
     private Integer containType;
 
+    /**
+     * 功率
+     */
+    private String power;
+
+    private String boxName;
+
 }

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceConfigDto {
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态（0异常1正常）
+     */
+    private Integer state;
+
+    /**
+     * 位置
+     */
+    private String position;
+
+    /**
+     * 仓库id
+     */
+    private String locationId;
+
+    /**
+     * 日常日志信息
+     */
+    private String errorLog;
+
+    /**
+     * 设备配置信息
+     */
+    private String deviceConfig;
+
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    private String locationName;
+    private String orgName;
+    private Integer deviceType;
+
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class EquipmentDto {
+    private String id;
+    /**
+     * 装备包ID
+     */
+    private String packageId;
+
+    private Integer equipmentType;
+
+    /**
+     * 装备类型ID
+     */
+    private String typeId;
+    /**
+     * 装备号型ID
+     */
+    private String sizeId;
+
+    /**
+     * 供应商id
+     */
+    private String supplierId;
+    /**
+     * epc
+     */
+    private String epc;
+    /**
+     * 组织机构id
+     */
+    private String orgId;
+    /**
+     * 物资状态
+     */
+    private String state;
+    /**
+     * 业务状态
+     */
+    private String bussinessState;
+
+    /**
+     * 生产日期
+     */
+    private Date productionDate;
+    /**
+     * 质保期
+     */
+    private int warrantyPeriod;
+
+    /**
+     * 维保期
+     */
+    private int maintenancePeriod;
+
+
+    /**
+     * 维修次数
+     */
+    private int fixCount;
+
+    /**
+     * 位置类型
+     */
+    private String locationType;
+
+    /**
+     * 位置
+     */
+    private String locationId ;
+    /**
+     * 是否遗失
+     */
+    private int lostFlag ;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price ;
+
+    /**
+     * 备注
+     */
+    private String note ;
+
+    private Date createTime;
+    private Date updateTime;
+    private String typeName;
+    private String sizeName;
+    private String supplierName;
+    private String locationName;
+
+    //状态，normal正常，destory销毁，fix维修
+    private String equState;
+
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class PoliceDto {
+    private String id;
+
+    private String name;
+    //组织机构id
+    private Long orgId;
+
+    private String policeCode;
+
+    private String doorCode;
+
+    private String faceInfo;
+
+    private String password;
+
+    private String photo;
+
+    private String tel;
+
+    private String phone;
+
+    private String idCard;
+    //状态
+    private Integer state;
+
+
+    private Long userId;
+    /**
+     * 0警员，1辅警
+     */
+    private Integer identity;
+
+    /**
+     * 海康人脸机
+     */
+    private Integer hkFaceDevice;
+
+    private Date updateTime;
+    private Date createTime;
+
+    //指纹信息列表
+    private List<PoliceFingerDto> fingersList;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupplierInfoDto {
+    /**
+     * 供应商ID
+     */
+    private String id;
+
+    /**
+     * 供应商名称
+     */
+
+    private String name;
+
+    /**
+     * 供应商短码
+     */
+
+    private String code;
+
+    /**
+     * 简称
+     */
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+    private Date createTime;
+
+    private Date updateTime;
+
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+
+    /**
+     * 1为启用，0为禁用
+     */
+    private Integer state;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TypeDto {
+    private String id;
+    private String name;
+    private String unit;
+    private String unitType;
+    private String parentId;
+    private String parentIds;
+    private String code;
+    private Integer state;
+    private String note;
+    private String guid;
+    private Integer type;
+    private Date createTime;
+    private Date updateTime;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UserDto {
+
+    private Long userId;
+    private String realName;
+    private String nickName;
+    private String account;
+    private String password;
+    private Integer userType;
+    private Date birthday;
+    private String sex;
+    private String email;
+    private String phone;
+    private String tel;
+    private String superAdminFlag;
+    private Integer statusFlag;
+    private Date createTime;
+    private Date updateTime;
+    private String roleCode;
+    private String roleName;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WarehouseDevInfoDto {
+    private String id;
+
+    /**
+     *
+     */
+    private String warehouseId;
+
+    /**
+     * Ip地址
+     */
+    private String devIp;
+
+    /**
+     * 端口
+     */
+    private String devPort;
+
+    /**
+     * 名称
+     */
+    private String devName;
+
+    /**
+     * 设备mac
+     */
+    private String devCode;
+
+    /**
+     * 湿度
+     */
+    private String warehouseSd;
+
+    /**
+     * 温度
+     */
+    private String warehouseWd;
+
+    /**
+     * 设定的开关
+     */
+    private String setState;
+
+    /**
+     * 状态：0关闭1开启
+     */
+    private Integer devState;
+
+    /**
+     * 设定的温度
+     */
+    private Integer setSd;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+@Data
+public class WarehouseInfoDto {
+    private String id;
+
+    private String name;
+
+    private String location;
+
+    private String phone;
+
+    private Long orgId;
+
+    /**
+     * 是否锁库，0未锁，1已锁定
+     */
+    private Integer isLocked;
+
+    private String state;
+}

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

+package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class sizeDto {
+    /**
+     * 装备号型ID
+     */
+    private String id;
+
+    /**
+     * 装备类型ID
+     */
+    private String typeId;
+
+
+    /**
+     * 号型码
+     */
+    private String code;
+
+    /**
+     * 号型名称
+     */
+    private String name;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    private Date createTime;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 当前状态：0关闭/1启用
+     */
+    private Integer state;
+
+    private Integer epcType;
+}

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.api.bean.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -99,5 +100,7 @@ public class LogSummaryDto implements Serializable {
      */
     private String createUser;
 
+    private BigDecimal price;
+
 
 }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -66,4 +67,6 @@ public class LogSummarySecondDto implements Serializable {
      */
     private String updateUser;
 
+    private BigDecimal price;
+
 }
\ No newline at end of file

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

@@ -4,12 +4,19 @@ package com.junmp.jyzb.api.bean.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 public class PoliceFingerDto implements Serializable {
+    private Integer id;
+
+    private String policeId;
 
     private String name;
 
     private String fingerInfo;
 
+    private Date createTime;
+    private Date updateTime;
+
 }

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

@@ -69,4 +69,6 @@ public class TjOrgCountDto implements Serializable {
      */
     private Integer number;
 
+    private String typeParentId;
+
 }
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WarehouseDevDto {
+
+    private String id;
+
+    /**
+     * 仓库id
+     */
+    private String warehouseId;
+
+    /**
+     * 组织机构id
+     */
+    private String orgId;
+    /**
+     * Ip地址
+     */
+    private String devIp;
+
+    /**
+     * 端口
+     */
+    private String devPort;
+
+    /**
+     * 名称
+     */
+    private String devName;
+
+    /**
+     * 设备mac
+     */
+    private String devCode;
+
+    /**
+     * 湿度
+     */
+    private String warehouseSd;
+
+    /**
+     * 温度
+     */
+    private String warehouseWd;
+
+    /**
+     * 设定的开关
+     */
+    private String setState;
+
+    /**
+     * 状态：0关闭1开启
+     */
+    private Integer devState;
+
+    /**
+     * 设定的温度
+     */
+    private Integer setSd;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String orgName;
+    private String warehouseName;
+
+}

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

@@ -2,6 +2,8 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class LogSummarySecondReq {
 
@@ -14,5 +16,7 @@ public class LogSummarySecondReq {
     private String sizeId;
 
     private Integer num;
+    //单价
+    private BigDecimal price;
 
 }
\ No newline at end of file

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

@@ -70,6 +70,7 @@ public class InventoryReq extends BaseRequest {
     /**
      * epc
      */
+    @NotBlank(message = "epc不能为空",groups = {page.class})
     private String epc;
 
     /**
@@ -184,4 +185,6 @@ public class InventoryReq extends BaseRequest {
      */
     private List<String> epcList;
 
+    private Boolean isCreateNullDate;
+
 }

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

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class QueryDeviceConfigReq extends BaseRequest {
+
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态（0异常1正常）
+     */
+    private Integer state;
+
+    /**
+     * 位置
+     */
+    private String position;
+
+    /**
+     * 仓库id
+     */
+    private String locationId;
+
+    /**
+     * 日常日志信息
+     */
+    private String errorLog;
+
+    /**
+     * 设备配置信息
+     */
+    private String deviceConfig;
+
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    private Integer deviceType;
+
+}

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

+package com.junmp.jyzb.api.bean.query;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class QueryWarehouseDevReq {
+
+    private String id;
+
+    /**
+     * 仓库id
+     */
+    private String warehouseId;
+
+    /**
+     * 组织机构id
+     */
+    private String orgId;
+    /**
+     * Ip地址
+     */
+    private String devIp;
+
+    /**
+     * 端口
+     */
+    private String devPort;
+
+    /**
+     * 名称
+     */
+    private String devName;
+
+    /**
+     * 设备mac
+     */
+    private String devCode;
+
+    /**
+     * 湿度
+     */
+    private String warehouseSd;
+
+    /**
+     * 温度
+     */
+    private String warehouseWd;
+
+    /**
+     * 设定的开关
+     */
+    private String setState;
+
+    /**
+     * 状态：0关闭1开启
+     */
+    private Integer devState;
+
+    /**
+     * 设定的温度
+     */
+    private Integer setSd;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

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

@@ -16,4 +16,6 @@ public class TjOrgCountReq extends BaseRequest {
     private List<String> sizeNameList;
     @NotNull(message = "年份不能为空",groups = detail.class)
     private Integer year;
+
+    private List<Integer> monthList;
 }
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class UpdateDeivceConfigReq implements Serializable {
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态（0异常1正常）
+     */
+    private Integer state;
+
+    /**
+     * 位置
+     */
+    private String position;
+
+    /**
+     * 仓库id
+     */
+    private String locationId;
+
+    /**
+     * 日常日志信息
+     */
+    private String errorLog;
+
+    /**
+     * 设备配置信息
+     */
+    private String deviceConfig;
+
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    private Integer deviceType;
+
+}

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class UpdateWarehouseDevReq {
+
+    private String id;
+
+    /**
+     * 仓库id
+     */
+    private String warehouseId;
+
+    /**
+     * 组织机构id
+     */
+    @NotNull(message = "组织机构id不能为空",groups = {ValidationApi.list.class})
+    private String orgId;
+    /**
+     * Ip地址
+     */
+    private String devIp;
+
+    /**
+     * 端口
+     */
+    private String devPort;
+
+    /**
+     * 名称
+     */
+    private String devName;
+
+    /**
+     * 设备mac
+     */
+    private String devCode;
+
+    /**
+     * 湿度
+     */
+    private String warehouseSd;
+
+    /**
+     * 温度
+     */
+    private String warehouseWd;
+
+    /**
+     * 设定的开关
+     */
+    private String setState;
+
+    /**
+     * 状态：0关闭1开启
+     */
+    private Integer devState;
+
+    /**
+     * 设定的温度
+     */
+    private Integer setSd;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

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

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.DeviceConfig;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.junmp.jyzb.service.DeviceConfigService;
+import com.junmp.jyzb.service.WarehouseDevService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequestMapping("/DeviceConfig")
+@Api(tags = "[配置]配置信息模块")
+public class DeviceConfigController {
+    @Resource
+    private DeviceConfigService deviceConfigService;
+
+    @Resource
+    private WarehouseDevService warehouseDevService;
+
+    //新增配置
+    @PostMapping("/addDeviceConfig")
+    @ApiOperation("新增配置")
+    public ApiRes<Long> addDeviceConfig(@RequestBody UpdateDeivceConfigReq req){
+        return ApiRes.success(deviceConfigService.addDeviceConfig(req));
+    }
+    //修改配置
+    @PostMapping("/updateDeviceConfig")
+    @ApiOperation("修改配置")
+    public ApiRes<Boolean> updateDeviceConfig(@RequestBody UpdateDeivceConfigReq req){
+        return ApiRes.success(deviceConfigService.updateDeviceConfig(req));
+    }
+    //查询配置Page
+    @PostMapping("/showDeviceConfigPage")
+    @ApiOperation("查询配置Page")
+    public ApiRes<PageResult<DeviceConfig>> showDeviceConfigPage(@RequestBody QueryDeviceConfigReq req){
+        return ApiRes.success(deviceConfigService.showDeviceConfigPage(req));
+    }
+    //查询配置List
+    @PostMapping("/showDeviceConfigList")
+    @ApiOperation("查询配置List")
+    public ApiRes<List<DeviceConfig>> showDeviceConfigList(@RequestBody QueryDeviceConfigReq req){
+        return ApiRes.success(deviceConfigService.showDeviceConfigList(req));
+    }
+
+    //新增除湿机配置
+    @PostMapping("/addWarehouseDev")
+    @ApiOperation("新增除湿机配置")
+    public ApiRes<String> addWarehouseDev(@RequestBody UpdateWarehouseDevReq req){
+        return ApiRes.success(warehouseDevService.addWarehouseDev(req));
+    }
+    //修改除湿机配置
+    @PostMapping("/updateWarehouseDev")
+    @ApiOperation("修改除湿机配置")
+    public ApiRes<Boolean> updateWarehouseDev(@RequestBody UpdateWarehouseDevReq req){
+        return ApiRes.success(warehouseDevService.updateWarehouseDev(req));
+    }
+    //查看除湿机配置
+    @PostMapping("/showWarehouseDevList")
+    @ApiOperation("查看除湿机配置")
+    public ApiRes<List<WarehouseDev>> showWarehouseDevList(@RequestBody @Validated(ValidationApi.list.class) UpdateWarehouseDevReq req){
+        return ApiRes.success(warehouseDevService.showWarehouseDevList(req));
+    }
+}

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

 package com.junmp.jyzb.controller;
 
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.query.*;
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
 import com.junmp.jyzb.api.bean.req.EquipmentBindReq;
@@ -264,8 +265,15 @@ public class InventoryController {
     }
 
     @PostMapping("/selectSumByItems")
+    @ApiOperation("通过条件查询库存汇总")
     public ApiRes<List<InventorySummary>> selectSumByItems(@RequestBody SelectTotalNumReq req){
         return ApiRes.success(inventorySummaryService.selectSumByItems(req));
     }
 
+    @PostMapping("/alignInventoryInfo")
+    @ApiOperation("同步更新装备信息")
+    public ApiRes<List<EquipmentDto>> alignInventoryInfo(@RequestBody InventoryReq req){
+        return ApiRes.success(inventoryService.alignInventoryInfo(req));
+    }
+
 }

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

@@ -71,7 +71,7 @@ public class OutAndInboundController {
     //通过装备id查询某一件装备的出入库记录
     @PostMapping("/ShowInOutRecordsByEqs")
     @ApiOperation("出入库记录装备id查询展示")
-    public ApiRes<PageResult<LogDetail>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
+    public ApiRes<PageResult<LogDetail>> getInOutRecords(@RequestBody @Validated(ValidationApi.page.class) InventoryReq req){
         return ApiRes.success(logDetailService.getInOutRecords(req));
     }
 

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

 package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
@@ -21,6 +22,7 @@ import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
 import com.junmp.v2.sys.user.controller.SysUserController;
+import com.junmp.v2.sys.user.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import liquibase.pro.packaged.B;
@@ -91,6 +93,18 @@ public class PoliceController {
         }
         return ApiRes.success(b);
     }
+    //重置密码
+    @PostMapping("/reSetPassword")
+    @ApiOperation("重置密码")
+    public ApiRes<Boolean> reSetPassword(@RequestBody SysUserReq req){
+        return ApiRes.success(policemanService.reSetPassword(req));
+    }
+    //重置密码
+    @PostMapping("/updatePassword")
+    @ApiOperation("重置密码")
+    public ApiRes<Boolean> updatePassword(@RequestBody SysUserReq req){
+        return ApiRes.success(policemanService.updatePassword(req));
+    }
 
 
 
@@ -239,4 +253,10 @@ public class PoliceController {
         return ApiRes.success(policemanService.getPoliceWithoutOrg());
     }
 
+
+    @PostMapping("/alignPoliceInfo")
+    @ApiOperation("同步更新警员信息")
+    public ApiRes<List<PoliceDto>> alignPoliceInfo(@RequestBody PolicemanReq req){
+        return ApiRes.success(policemanService.alignPoliceInfo(req));
+    }
 }

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

@@ -12,6 +12,7 @@ import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.B;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -115,6 +116,20 @@ public class TjController {
         return ApiRes.success(tjService.TjOrgCountDetailList(req));
     }
 
+    //更新使用次数统计报表
+    @PostMapping("updateTjOrgCount")
+    @ApiOperation("更新使用次数统计报表")
+    public ApiRes<Boolean> updateTjOrgCount(@RequestBody TjOrgCountReq req){
+        return ApiRes.success(tjService.updateTjOrgCount(req));
+    }
+
+    //首页使用柱状图
+    @PostMapping("/TjOrgCountByType")
+    @ApiOperation("九大类使用统计柱状图")
+    public ApiRes<List<TjOrgCountDto>> TjOrgCountByType(@RequestBody TjOrgCountReq req){
+        return ApiRes.success(tjService.TjOrgCountByType(req));
+    }
+
     /**
      * --------------------------------------人员统计报表-------------------------------------------
      */

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.controller;
 
 
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.sys.user.service.SysUserRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -19,4 +20,7 @@ import java.util.Map;
 @Api(tags = "用户表")
 public class UserController {
 
+
+    //修改用户密码
+
 }

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName base_device_config
+ */
+@TableName(value ="base_device_config")
+@Data
+public class DeviceConfig implements Serializable {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    @TableField(value = "device_name")
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    @TableField(value = "device_code")
+    private String deviceCode;
+
+    /**
+     * 设备状态（0异常1正常）
+     */
+    @TableField(value = "state")
+    private Integer state;
+
+    /**
+     * 位置
+     */
+    @TableField(value = "position")
+    private String position;
+
+    /**
+     * 仓库id
+     */
+    @TableField(value = "location_id")
+    private String locationId;
+
+    /**
+     * 日常日志信息
+     */
+    @TableField(value = "error_log")
+    private String errorLog;
+
+    /**
+     * 设备配置信息
+     */
+    @TableField(value = "device_config")
+    private String deviceConfig;
+
+    /**
+     * 组织机构id
+     */
+    @TableField(value = "org_id")
+    private Long orgId;
+
+    /**
+     * 类型：0通道1仓库主机
+     */
+    @TableField(value = "device_type")
+    private Integer deviceType;
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    @TableField(exist = false)
+    private String locationName;
+
+    @TableField(exist = false)
+    private String orgName;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

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

@@ -142,6 +142,9 @@ public class LogDetail implements Serializable {
     @TableField(value = "price")
     private BigDecimal price;
 
+    @TableField(exist = false)
+    private String locationName;
+
     private static final long serialVersionUID = 1L;
 
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -140,6 +141,8 @@ public class LogSummary implements Serializable {
     @TableField(value = "number")
     private Integer number;
 
+    private BigDecimal price;
+
     private static final long serialVersionUID = 1L;
 
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -81,6 +82,9 @@ public class LogSummarySecond implements Serializable {
     @TableField(value = "update_user")
     private String updateUser;
 
+    @TableField(value = "price")
+    private BigDecimal price;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

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

@@ -30,6 +30,9 @@ public class PoliceFinger implements Serializable {
     @TableField(value = "finger_info")
     private String fingerInfo;
 
+    @TableField(value = "finger_num")
+    private String fingerNum;
+
     @TableField(fill = FieldFill.INSERT, value = "create_time")
     private Date createTime;
 

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 温湿度
+ * @TableName sys_temp_humidity
+ */
+@TableName(value ="base_warehouse_dev")
+@Data
+public class WarehouseDev implements Serializable {
+    /**
+     * 
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 仓库id
+     */
+    @TableField(value = "warehouse_id")
+    private String warehouseId;
+
+    /**
+     * 组织机构id
+     */
+    @TableField(value = "org_id")
+    private String orgId;
+    /**
+     * Ip地址
+     */
+    @TableField(value = "dev_ip")
+    private String devIp;
+
+    /**
+     * 端口
+     */
+    @TableField(value = "dev_port")
+    private String devPort;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "dev_name")
+    private String devName;
+
+    /**
+     * 设备mac
+     */
+    @TableField(value = "dev_code")
+    private String devCode;
+
+    /**
+     * 湿度
+     */
+    @TableField(value = "warehouse_sd")
+    private String warehouseSd;
+
+    /**
+     * 温度
+     */
+    @TableField(value = "warehouse_wd")
+    private String warehouseWd;
+
+    /**
+     * 设定的开关
+     */
+    @TableField(value = "set_state")
+    private String setState;
+
+    /**
+     * 状态：0关闭1开启
+     */
+    @TableField(value = "dev_state")
+    private Integer devState;
+
+    /**
+     * 设定的温度
+     */
+    @TableField(value = "set_sd")
+    private Integer setSd;
+
+    /**
+     * 
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private String orgName;
+
+    @TableField(exist = false)
+    private String warehouseName;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/DeviceConfigMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
+import com.junmp.jyzb.entity.DeviceConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_device_config】的数据库操作Mapper
+* @createDate 2023-12-19 07:18:22
+* @Entity com.junmp.jyzb.entity.DeviceConfig
+*/
+public interface DeviceConfigMapper extends BaseMapper<DeviceConfig> {
+
+
+
+    int showDeviceConfigCount(@Param("req") QueryDeviceConfigReq req);
+
+    List<DeviceConfig> showDeviceConfig(@Param("orgId") Long orgId,
+                                        @Param("deviceType") Integer deviceType,
+                                        @Param("deviceName") String deviceName,
+                                        @Param("deviceCode") String deviceCode,
+                                        @Param("pageNo") Long pageNo,
+                                        @Param("pageSize") Long pageSize);
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.mapper;
 
 import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.entity.EquipmentCountSummary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,7 @@ import java.util.List;
 */
 public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSummary> {
 
-    void addInfo();
+    void addInfo(@Param("sql") String sql);
 
     List<TjOrgCountDto> TjOrgCount(@Param("orgId") Long orgId,
                                    @Param("typeIdsList") List<String> typeIdsList,
@@ -38,6 +39,10 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
                                          @Param("typeIdsList") List<String> typeIdsList,
                                          @Param("sizeNameList") List<String> sizeNameList,
                                          @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
+
+    void deleteAll(@Param("orgId") Long orgId);
+
+    List<TjOrgCountDto> TjOrgCountByType(@Param("req") TjOrgCountReq req);
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.bean.dto.EqsBriefDto;
 import com.junmp.jyzb.api.bean.dto.EqsSumDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventoryDto;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
@@ -32,32 +33,36 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
 
 
     //根据货架id查询汇总信息(list)
-    List<InventorySummary> getSumByShelf(String shelfId);
+    List<InventorySummary> getSumByShelf(@Param("shelfId") String shelfId);
 
     //根据货架id查询汇总信息(page)
-    IPage<InventorySummary> ShelfInventoryPage(Page<InventorySummary> page, String shelfId);
+    IPage<InventorySummary> ShelfInventoryPage(@Param("page") Page<InventorySummary> page,
+                                               @Param("shelfId") String shelfId);
 
     //根据区域id查询汇总信息(list)
-    List<InventorySummary> getSumByArea(String id);
+    List<InventorySummary> getSumByArea(@Param("id") String id);
 
     //根据区域id查询汇总信息(page)
-    IPage<InventorySummary> AreaInventoryPage(Page<InventorySummary> page, String id);
+    IPage<InventorySummary> AreaInventoryPage(@Param("page") Page<InventorySummary> page,
+                                              @Param("id") String id);
 
     //通过单警柜箱门id获取箱门下的装备汇总信息(list)
-    List<InventorySummary> getSumByCabinetBox(String id);
+    List<InventorySummary> getSumByCabinetBox(@Param("id") String id);
 
     //通过查询条件查询出装备数量报表
-    List<EqsSumDto> GetListEquipment(InventoryReq req);
+    List<EqsSumDto> GetListEquipment(@Param("req") InventoryReq req);
 
     //查询组织机构下面的装备信息
-    List<InventoryVo> selectListByOrg(Long orgId);
+    List<InventoryVo> selectListByOrg(@Param("orgId") Long orgId);
 
 
     //通过单警柜箱门id获取箱门下的装备汇总信息(page)
-    IPage<InventorySummary> EqsByCabinetBoxIdPage(Page<InventorySummary> page,@Param("id") String id);
+    IPage<InventorySummary> EqsByCabinetBoxIdPage(@Param("page") Page<InventorySummary> page,
+                                                  @Param("id") String id);
 
 
-     boolean insertInventorySummary(@Param("req") BatchEditingInvsReq req,@Param("brokenNumberDays")Integer brokenNumberDays);
+     boolean insertInventorySummary(@Param("req") BatchEditingInvsReq req,
+                                    @Param("brokenNumberDays")Integer brokenNumberDays);
 
      //判断epc是否存在
     List<String> checkEPCList(@Param("list") List<String> epcList);
@@ -74,5 +79,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
 
     List<Inventory> searchExpireEqs(@Param("list") List<Object[]> searchItem);
 
-    IPage<InventoryDto> GetDetailByTerms(Page<Object> defaultPage, @Param("req") InventoryReq req);
+    IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
+
+    List<EquipmentDto> alignInventoryInfo(@Param("req") InventoryReq req);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/LogDetailMapper.java

@@ -18,6 +18,10 @@ public interface LogDetailMapper extends BaseMapper<LogDetail> {
     List<LogDetailDto> GetDetailByLogSumId(@Param("summaryId") Long summaryId);
 
     List<LogDetailDto> ShowInOutRecordsByOrder(@Param("orderMainId") String orderMainId);
+
+    int getInOutRecordsSize(@Param("epc") String epc);
+
+    List<LogDetail> getInOutRecords(@Param("epc")String epc, @Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseDevMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【sys_temp_humidity(温湿度)】的数据库操作Mapper
+* @createDate 2023-12-19 08:33:43
+* @Entity com.junmp.jyzb.entity.WarehouseDev
+*/
+public interface WarehouseDevMapper extends BaseMapper<WarehouseDev> {
+
+    List<WarehouseDev> showWarehouseDevList(@Param("req") UpdateWarehouseDevReq req);
+}
+
+
+
+

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

+package com.junmp.jyzb.service;
+
+
+import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.DeviceConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.junmp.v2.db.api.page.PageResult;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_device_config】的数据库操作Service
+* @createDate 2023-12-19 07:18:22
+*/
+public interface DeviceConfigService extends IService<DeviceConfig> {
+
+    Long addDeviceConfig(UpdateDeivceConfigReq req);
+
+    boolean updateDeviceConfig(UpdateDeivceConfigReq req);
+
+    PageResult<DeviceConfig> showDeviceConfigPage(QueryDeviceConfigReq req);
+
+    List<DeviceConfig> showDeviceConfigList(QueryDeviceConfigReq req);
+
+
+}

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.query.*;
 
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
@@ -84,4 +85,6 @@ public interface InventoryService extends IService<Inventory> {
 
     //根据条件查询满足条件的数据（用于快速移库修改装备仓库id）
     List<Inventory> selectEqsByItem(List<Object[]> searchCriteria);
+
+    List<EquipmentDto> alignInventoryInfo(InventoryReq req);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+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.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.CabinetInOutRecordsReq;
@@ -41,7 +43,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     //计算装备总数（装备数量数据统计）
     List<InventorySummary> EquipmentStatistics(InventorySumReq req);
 
-    //出入库时无单据查询库存汇总并统计更新或者记账时根据单据查询库存汇总并统计更新
+    //通过条件查询库存汇总
     List<InventorySummary> selectSumByItems(SelectTotalNumReq req);
 
 
@@ -53,4 +55,6 @@ public interface InventorySummaryService extends IService<InventorySummary> {
      * 更新使用次数和维修次数
      */
     void updateCount();
+
+
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
 import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
@@ -13,6 +14,7 @@ import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.entity.Reassignment;
+import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
@@ -104,4 +106,10 @@ public interface PolicemanService extends IService<Policeman> {
     List<PolicemanDto> getPoliceWithoutOrg();
 
     UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req);
+
+    boolean reSetPassword(SysUserReq req);
+
+    boolean updatePassword(SysUserReq req);
+
+    List<PoliceDto> alignPoliceInfo(PolicemanReq req);
 }

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

@@ -40,4 +40,8 @@ public interface TjService {
     PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req);
 
     List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req);
+
+    boolean updateTjOrgCount(TjOrgCountReq req);
+
+    List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
 }

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

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【sys_temp_humidity(温湿度)】的数据库操作Service
+* @createDate 2023-12-19 08:33:43
+*/
+public interface WarehouseDevService extends IService<WarehouseDev> {
+
+    String addWarehouseDev(UpdateWarehouseDevReq req);
+
+    boolean updateWarehouseDev(UpdateWarehouseDevReq req);
+
+    List<WarehouseDev> showWarehouseDevList(UpdateWarehouseDevReq req);
+
+}

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

+package com.junmp.jyzb.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+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.query.QueryDeviceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.DeviceConfig;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.junmp.jyzb.mapper.WarehouseDevMapper;
+import com.junmp.jyzb.service.DeviceConfigService;
+import com.junmp.jyzb.mapper.DeviceConfigMapper;
+import com.junmp.jyzb.service.WarehouseDevService;
+import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
+import net.minidev.json.writer.BeansMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_device_config】的数据库操作Service实现
+* @createDate 2023-12-19 07:18:22
+*/
+@Service
+public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, DeviceConfig>
+    implements DeviceConfigService{
+
+    @Resource
+    private DeviceConfigMapper deviceConfigMapper;
+
+
+
+    @Override
+    public Long addDeviceConfig(UpdateDeivceConfigReq req) {
+        DeviceConfig deviceConfig = new DeviceConfig();
+        BeanPlusUtil.copyProperties(req,deviceConfig);
+        deviceConfig.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        save(deviceConfig);
+        return deviceConfig.getId() ;
+    }
+
+    @Override
+    public boolean updateDeviceConfig(UpdateDeivceConfigReq req) {
+        DeviceConfig deviceConfig = new DeviceConfig();
+        BeanPlusUtil.copyProperties(req,deviceConfig);
+        deviceConfig.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return updateById(deviceConfig);
+    }
+
+    @Override
+    public PageResult<DeviceConfig> showDeviceConfigPage(QueryDeviceConfigReq req) {
+        int size=deviceConfigMapper.showDeviceConfigCount(req);
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceType(),req.getDeviceName(),
+                req.getDeviceCode(),(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
+        Page<DeviceConfig> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(list);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public List<DeviceConfig> showDeviceConfigList(QueryDeviceConfigReq req) {
+        List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceType(),req.getDeviceName(),
+                req.getDeviceCode(),null,null);
+        return list;
+    }
+
+
+}
+
+
+
+

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

@@ -126,7 +126,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     @Override
     public PageResult<EquipmentSizeDto> getSizePages(QueryEquipmentSizeReq req) {
         Page<EquipmentSizeDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-       List<EquipmentSizeDto> voList= equipmentSizeMapper.getSizePage(req,page);
+        List<EquipmentSizeDto> voList= equipmentSizeMapper.getSizePage(req,page);
         page.setRecords(voList);
         return PageResultFactory.createPageResult(page);
 

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.query.*;
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
 import com.junmp.jyzb.api.bean.req.EquipmentBindReq;
@@ -596,5 +597,11 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         return inventoryMapper.selectEqsByItem(searchCriteria);
     }
 
+    @Override
+    public List<EquipmentDto> alignInventoryInfo(InventoryReq req) {
+
+        return inventoryMapper.alignInventoryInfo(req);
+    }
+
 
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ 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;
@@ -77,6 +78,8 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     @Resource
     private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
 
+
+
     @Override
     public void MonthStartSum() {
         PriceSumSummaryMapper.MonthStart();
@@ -272,7 +275,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     }
 
 
-    //出入库时无单据查询库存汇总并统计更新或者记账时根据单据查询库存汇总并统计更新
+    //根据条件查询库存汇总
     @Override
     public List<InventorySummary> selectSumByItems(SelectTotalNumReq req) {
         List<InventorySumReq> list = req.getList();
@@ -346,12 +349,16 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateCount() {
-        LambdaUpdateWrapper<InventorySummary> eq = new LambdaUpdateWrapper<InventorySummary>().set(InventorySummary::getUseCount,0).set(InventorySummary::getFixCount,0);
+        //先统计上一个月的使用次数和维修次数，然后再进行置零，开始计算下一个月的数据
+        equipmentCountSummaryMapper.deleteAll(null);
+        equipmentCountSummaryMapper.addInfo(" 1=1");
+        LambdaUpdateWrapper<InventorySummary> eq = new LambdaUpdateWrapper<InventorySummary>()
+                .set(InventorySummary::getUseCount,0).set(InventorySummary::getFixCount,0);
         update(eq);
-        equipmentCountSummaryMapper.addInfo();
     }
 
 
+
     private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
         LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isEmpty(req)) {

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

@@ -8,12 +8,14 @@ import com.junmp.jyzb.api.bean.dto.LogDetailDto;
 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.entity.BusForm;
 import com.junmp.jyzb.entity.LogDetail;
 import com.junmp.jyzb.entity.OrderMain;
 import com.junmp.jyzb.service.InventoryService;
 import com.junmp.jyzb.service.LogDetailService;
 import com.junmp.jyzb.mapper.LogDetailMapper;
 import com.junmp.jyzb.service.OrderMainService;
+import com.junmp.jyzb.utils.BusinessUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
@@ -63,10 +65,22 @@ public class LogDetailServiceImpl extends ServiceImpl<LogDetailMapper, LogDetail
     @Override
     public PageResult<LogDetail> getInOutRecords(InventoryReq req) {
         //通过装备id获取出入库记录(判断id是否存在)
-        inventoryService.InventoryExist(req.getId());
-        LambdaQueryWrapper<LogDetail> eq = new LambdaQueryWrapper<LogDetail>()
-                .eq(ObjectUtil.isNotNull(req.getEpc()),LogDetail::getEpc,req.getEpc());
-        Page<LogDetail> page = logDetailService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
+//        inventoryService.InventoryExist(req.getId());
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        int size=logDetailMapper.getInOutRecordsSize(req.getEpc());
+        List<LogDetail> logDetailList=logDetailMapper.getInOutRecords(req.getEpc(),(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
+        Page<LogDetail> page =PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        //是否创建创建空的数据返回前端
+//        if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
+//            Class<LogDetail> busForm=LogDetail.class;
+//            List<LogDetail> nullData = BusinessUtil.createNullData((long)size, req.getPageNo(), req.getPageSize(), busForm);
+//            logDetailList.addAll(nullData);
+//        }
+        page.setRecords(logDetailList);
+        page.setTotal(size);
         return PageResultFactory.createPageResult(page);
     }
 }

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

@@ -119,7 +119,8 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             if (ObjectUtil.isNull(one.getActualQuantity())){
                 one.setActualQuantity(0);
             }
-            one.setActualQuantity(order.getActualQuantity()+one.getActualQuantity());
+//            one.setActualQuantity(order.getActualQuantity()+one.getActualQuantity());
+            one.setActualQuantity(order.getActualQuantity());
             one.setOrderState(one.getOrderState());
             one.setOrderState("finished");
             one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
@@ -132,8 +133,9 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                         if (ObjectUtil.isNull(orderDetail.getActualNum())){
                             orderDetail.setActualNum(0);
                         }
-                        orderDetail.setModifyQuantity(orderDetail.getActualNum()+detailReq.getActualNum());
-                        orderDetail.setActualNum(orderDetail.getActualNum()+detailReq.getActualNum());
+//                        orderDetail.setModifyQuantity(orderDetail.getActualNum()+detailReq.getActualNum());
+                        orderDetail.setModifyQuantity(detailReq.getActualNum());
+                        orderDetail.setActualNum(detailReq.getActualNum());
                         orderDetail.setUpdateTime(DateTimeUtil.getCurrentDateTime());
                     }
                     break;
@@ -203,7 +205,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             normalInOutDtos = saveInOutRecords(req);
         }
 
-        //4.对正常出入库记录进行装备汇总统计
+        //4.对日常出入库记录进行装备汇总统计
         boolean d=true;
         if (normalInOutDtos.size()>0){
             String outInState = normalInOutDtos.get(0).getOutInState();
@@ -482,7 +484,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         for (NormalInOutDto outDto:groupedResult) {
             boolean flag=false;
             for (InventorySummary is:inventorySummaryList) {
-                if (outDto.getOrgId()==is.getOrgId() && outDto.getLocationId().equals(is.getLocationId())
+                if (outDto.getOrgId().equals(is.getOrgId()) && outDto.getLocationId().equals(is.getLocationId())
                         && outDto.getSizeId().equals(is.getSizeId()) && outDto.getTypeId().equals(is.getTypeId())
                         && outDto.getPrice().compareTo(is.getUnitPrice())==0){
                     if (outInState.equals("in")){

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

@@ -204,7 +204,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     .eq(SysDictItem::getItemValue, req.getBussinessType())).getItemText();
             s=s+itemText+"单：";
         }
-
+        List<Object[]> searchItem=new ArrayList<>();
         for (UpdateOrderDetailReq listReq:req.getDetailList()) {
             OrderDetail detail=new OrderDetail();
             BeanPlusUtil.copyProperties(listReq, detail);
@@ -227,6 +227,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             //添加日志记录
             s=s+listReq.getWarehouseName()+"【"+listReq.getTypeName()+"--"+listReq.getSizeName()+"】预计数量："+listReq.getPlanNum()+"/";
             detailList.add(detail);
+            Object[] item=new Object[]{req.getStartOrgId(),listReq.getWarehouseId(),listReq.getTypeId(),listReq.getSizeId(),listReq.getPrice()};
+            searchItem.add(item);
         }
         orderDetailService.saveBatch(detailList);
         //设置总价格和总数量
@@ -254,6 +256,18 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
            }
        }
+       //如果是销毁出库，并且有审核流，那么直接将库存汇总信息进行修改
+       if (req.getExamineState().equals("working") && req.getBussinessType().equals("destruction")){
+           List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
+           for (UpdateOrderDetailReq dq:req.getDetailList()) {
+               for (InventorySummary is:inventorySummaryList) {
+                   if (is.getLocationId().equals(dq.getWarehouseId()) && is.getTypeId().equals(dq.getTypeId())
+                   && is.getSizeId().equals(dq.getSizeId()) && is.getUnitPrice().compareTo(dq.getPrice())==0){
+
+                   }
+               }
+           }
+       }
 
         //list返回数据
         List<String> list=new ArrayList<>();
@@ -1038,7 +1052,27 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                 is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())) );
                                 break;
                             case "use":
+                                is.setOutboundNumber(is.getOutboundNumber()+upReq.getModifyQuantity());
+                                is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());
+                                is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())) );
+                                if (ObjectUtil.isNull(is.getUseCount())){
+                                    is.setUseCount(0);
+                                }
+                                is.setUseCount(is.getUseCount()+upReq.getModifyQuantity());
+                                if(ObjectUtil.isNull(is.getUseNumber())){
+                                    is.setUseNumber(0);
+                                }
+                                is.setUseNumber(is.getUseNumber()+upReq.getModifyQuantity());
+                                break;
                             case "repair":
+                                is.setOutboundNumber(is.getOutboundNumber()+upReq.getModifyQuantity());
+                                is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());
+                                is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())) );
+                                if (ObjectUtil.isNull(is.getFixCount())){
+                                    is.setFixCount(0);
+                                }
+                                is.setFixCount(is.getFixCount()+upReq.getModifyQuantity());
+                                break;
                             case "other":
                                 is.setOutboundNumber(is.getOutboundNumber()+upReq.getModifyQuantity());
                                 is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
@@ -43,6 +44,7 @@ import com.junmp.v2.file.biz.service.SysFileInfoService;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
+import com.junmp.v2.sys.api.expander.SystemConfigExpander;
 import com.junmp.v2.sys.user.entity.SysUser;
 import com.junmp.v2.sys.user.entity.SysUserOrg;
 import com.junmp.v2.sys.user.entity.SysUserRole;
@@ -112,9 +114,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     private CabinetBoxPoliceService cabinetBoxPoliceService;
 
     @Resource
-    private PolicemanService policemanService;
-
-    @Resource
     private SysDictService sysDictService;
 
     @Resource
@@ -135,6 +134,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private SysFileInfoService sysFileInfoService;
 
+    @Resource
+    private IStoredEncryptApi iStoredEncryptApi;
+
     private static final String REDIS_POLICE = "Policeman_";
     private static final String REDIS_ORG = "Organization_";
 
@@ -362,7 +364,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             );
         }
         //查询传入的组织机构id是否存在
-        pubOrgService.PubOrgExist(req.getOrgId());
+        PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         //判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在
         BeanPlusUtil.copyProperties(req, one);
         if (!req.getPoliceCode().equals(one.getPoliceCode())) {
@@ -386,6 +388,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             }).collect(Collectors.toList());
             sysUserRoleService.saveBatch(collect);
         }
+        //人员信息修改之后推送至本地主机和单警柜
+        //查询出单警柜的单警柜id，将
+        List<Cabinet> list = cabinetService.list(new LambdaQueryWrapper<Cabinet>().eq(Cabinet::getOrgIdInt, pubOrg.getOrgId()));
+        List<String> cabinetIdList = list.stream().map(cabinet -> cabinet.getId()).collect(Collectors.toList());
 
         return updateById(one);
     }
@@ -953,7 +959,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>();
 
         if (ObjectUtil.isNotNull(req.getPoliceId() )&& ! req.getPoliceId().trim().isEmpty()){
-            Policeman policeman = policemanService.PoliceExist(req.getPoliceId());
+            Policeman policeman = PoliceExist(req.getPoliceId());
             eq.eq(PoliceEquipment::getPoliceId, policeman.getId());
             return policeEquipmentService.list(eq);
         }else {
@@ -965,7 +971,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                     req.setColumn(req.getColumn().replaceAll("[A-Z]","_$0").toLowerCase());
                     req.setOrder(req.getOrder().toLowerCase());
                 }
-                Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>().eq(Policeman::getUserId, req.getUserId()));
+                Policeman one = getOne(new LambdaQueryWrapper<Policeman>().eq(Policeman::getUserId, req.getUserId()));
                 if (ObjectUtil.isNotNull(one)){
                     eq.eq(PoliceEquipment::getPoliceId, one.getId())
                             .like(ObjectUtil.isNotNull(req.getTypeName()),PoliceEquipment::getTypeName,req.getTypeName())
@@ -1273,7 +1279,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         // 如果存在，则查询file表将该数据进行删除，再调用上传文件接口，将返回的文件信息以及地址更新存储到警员表最终返回警员id和照片地址
         // 如果不存在照片，那么直接调用上传文件接口，将照片存储到警员表并且返回警员id和照片地址
         SysFileInfoReq sysFileInfoReq = new SysFileInfoReq();
-        Policeman policeman = policemanService.getById(req.getPoliceId());
+        Policeman policeman = getById(req.getPoliceId());
         PubOrg pubOrg = pubOrgService.PubOrgExist(policeman.getOrgId());
         if (ObjectUtil.isNotNull(policeman.getFileId())){
             //删除照片
@@ -1283,7 +1289,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             } catch (Exception var3) {
                 throw new ServiceException(PublicExceptionEnum.FILE_DEL_FAILTURE);
             }
-            
         }
         //上传照片
         sysFileInfoReq.setFileBucket("jyzb");
@@ -1300,5 +1305,64 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return uploadPolicePhotoDto;
     }
 
+    //重置密码
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean reSetPassword(SysUserReq req) {
+        IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi)SpringUtil.getBean(IStoredEncryptApi.class);
+        String defaultPassword = SystemConfigExpander.getDefaultPassWord();
+        String password = iStoredEncryptApi.encrypt(defaultPassword);
+        sysUserService.update(new LambdaUpdateWrapper<SysUser>().eq(SysUser::getUserId,req.getUserId())
+                .set(SysUser::getPassword,password));
+        Policeman one = getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getUserId, req.getUserId()));
+        if (ObjectUtil.isNotNull(one)){
+            one.setPassword(password);
+            updateById(one);
+        }
+        return true;
+    }
+
+    //修改密码
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updatePassword(SysUserReq req) {
+        Policeman one = getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getUserId, req.getUserId()));
+        if (ObjectUtil.isNotNull(one)){
+            IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi)SpringUtil.getBean(IStoredEncryptApi.class);
+            //如果不为空则表示修改警员密码
+            String newPassword = storedEncryptApi.encrypt(req.getPassword());
+            //同时修改警员密码
+            one.setPassword(newPassword);
+            updateById(one);
+        }
+        sysUserService.editPassword(req);
+        return true;
+    }
+
+    //同步警员信息
+    @Override
+    public List<PoliceDto> alignPoliceInfo(PolicemanReq req) {
+        LambdaQueryWrapper<Policeman> eq = new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getOrgId, req.getOrgId())
+                .ge(Policeman::getUpdateTime, req.getUpdateTime());
+        List<Policeman> list = list(eq);
+        List<PoliceDto> returnList = list.stream().map(policeman -> {
+            PoliceDto policeDto = new PoliceDto();
+            BeanPlusUtil.copyProperties(policeman, policeDto);
+            LambdaQueryWrapper<PoliceFinger> wq = new LambdaQueryWrapper<PoliceFinger>()
+                    .eq(PoliceFinger::getPoliceId, policeman.getId());
+            List<PoliceFinger> list1 = policeFingerService.list(wq);
+            List<PoliceFingerDto> collect = list1.stream().map(policeFinger -> {
+                PoliceFingerDto policeFingerDto = new PoliceFingerDto();
+                BeanPlusUtil.copyProperties(policeFinger, policeFingerDto);
+                return policeFingerDto;
+            }).collect(Collectors.toList());
+            policeDto.setFingersList(collect);
+            return policeDto;
+        }).collect(Collectors.toList());
+        return returnList;
+    }
 
 }

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

@@ -17,6 +17,7 @@ import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -397,4 +398,18 @@ public class TjServiceImpl implements TjService {
                 req.getTypeIdsList(),req.getSizeNameList(),null,null);
         return returnList;
     }
- }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateTjOrgCount(TjOrgCountReq req) {
+        String sql=" org_id_int = "+"'"+req.getOrgId()+"'";
+        equipmentCountSummaryMapper.deleteAll(req.getOrgId());
+        equipmentCountSummaryMapper.addInfo(sql);
+        return true;
+    }
+
+    @Override
+    public List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req) {
+        return equipmentCountSummaryMapper.TjOrgCountByType(req);
+    }
+}

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

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
+import com.junmp.jyzb.entity.WarehouseDev;
+import com.junmp.jyzb.service.WarehouseDevService;
+import com.junmp.jyzb.mapper.WarehouseDevMapper;
+import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【sys_temp_humidity(温湿度)】的数据库操作Service实现
+* @createDate 2023-12-19 08:33:43
+*/
+@Service
+public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, WarehouseDev>
+    implements WarehouseDevService {
+
+    @Resource
+    private WarehouseDevService warehouseDevService;
+
+    @Resource
+    private WarehouseDevMapper warehouseDevMapper;
+
+    @Override
+    public String addWarehouseDev(UpdateWarehouseDevReq req) {
+        WarehouseDev warehouseDev = new WarehouseDev();
+        BeanPlusUtil.copyProperties(req,warehouseDev);
+        warehouseDev.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        warehouseDevService.save(warehouseDev);
+        return warehouseDev.getId();
+    }
+
+    @Override
+    public boolean updateWarehouseDev(UpdateWarehouseDevReq req) {
+        WarehouseDev warehouseDev = new WarehouseDev();
+        BeanPlusUtil.copyProperties(req,warehouseDev);
+        warehouseDev.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return warehouseDevService.updateById(warehouseDev);
+    }
+
+    @Override
+    public List<WarehouseDev> showWarehouseDevList(UpdateWarehouseDevReq req) {
+        return warehouseDevMapper.showWarehouseDevList(req);
+    }
+
+}
+
+
+
+

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

 package com.junmp.jyzb.utils;
 
 import com.alibaba.fastjson.JSON;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Exchange;
-import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class RabbitMQSendMsg {
     @Resource
@@ -27,4 +26,20 @@ public class RabbitMQSendMsg {
         String jsonString = JSON.toJSONString(msg);
         rabbitTemplate.convertAndSend(exchangeName, name, jsonString);
     }
+
+    //推送消息（广播式推送）
+    public void sendFanoutMsg(String exchangeName, List<String> names,Object msg){
+        //exchangeName交换机名称，name单警柜或本地仓库，msg发送的消息
+        for (String name:names) {
+            Queue queue=new Queue(name,true,false,false);
+            Exchange exchange = new FanoutExchange(exchangeName, true, false);
+            rabbitAdmin.declareQueue(queue);
+            rabbitAdmin.declareExchange(exchange);
+            rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with("").noargs());
+            // 将消息发送到交换机
+            String jsonString = JSON.toJSONString(msg);
+            rabbitTemplate.convertAndSend(exchangeName, name, jsonString);
+        }
+
+    }
 }

jyzb-biz/src/main/resources/mapper/DeviceConfigMapper.xml

+<?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.junmp.jyzb.mapper.DeviceConfigMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.DeviceConfig">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
+            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="INTEGER"/>
+            <result property="position" column="position" jdbcType="VARCHAR"/>
+            <result property="locationId" column="location_id" jdbcType="VARCHAR"/>
+            <result property="errorLog" column="errorLog" jdbcType="VARCHAR"/>
+            <result property="deviceConfig" column="device_config" jdbcType="VARCHAR"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,device_name,device_code,
+        state,position,location_id,
+        errorLog,device_config,org_id,
+        create_time,update_time,create_user,
+        update_user
+    </sql>
+    <select id="showDeviceConfig" resultType="com.junmp.jyzb.entity.DeviceConfig"
+            parameterType="com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq">
+        select dc.*,po.org_name as org_name,bw.name as location_name from base_device_config dc
+                  join pub_org po on po.org_id=dc.org_id
+                  left join base_warehouse bw on bw.id=dc.location_id
+                 where dc.org_id =#{orgId} and dc.device_type=#{deviceType}
+        <if test="deviceName != null and deviceName != ''">
+            and dc.device_name =#{deviceName}
+        </if>
+        <if test="deviceCode != null and deviceCode != ''">
+            and dc.device_code =#{deviceCode}
+        </if>
+        <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
+            limit #{pageNo},#{pageSize}
+        </if>
+    </select>
+    <select id="showDeviceConfigCount" resultType="java.lang.Integer"
+            parameterType="com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq">
+        select count(*) from (
+            select dc.*,po.org_name as org_name,bw.name as location_name from base_device_config dc
+            join pub_org po on po.org_id=dc.org_id
+            left join base_warehouse bw on bw.id=dc.location_id
+            where dc.org_id =#{req.orgId}
+            <if test="req.deviceName != null and req.deviceName != ''">
+                and dc.device_name =#{req.deviceName}
+            </if>
+            <if test="req.deviceCode != null and req.deviceCode != ''">
+                and dc.device_code =#{req.deviceCode}
+            </if>
+            ) as a
+    </select>
+</mapper>

jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml

@@ -35,16 +35,25 @@
         type_id,type_name,number,
         update_time
     </sql>
-    <select id="addInfo" statementType="CALLABLE" >
-        {call AddEquipmentCountSummary()}
-    </select>
+    <delete id="deleteAll">
+        delete from vie_equipment_count_summary where
+        <if test="orgId!=null and orgId != ''">
+            org_id_int=#{orgId}
+        </if>
+        <if test="orgId==null and orgId == ''">
+            1=1
+        </if>
+    </delete>
+    <insert id="addInfo" statementType="CALLABLE" >
+        {call AddEquipmentCountSummary(#{sql,mode=IN})}
+    </insert>
     <select id="TjOrgCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
         SELECT
             t.org_id,
-            t.org_code,
-            t.org_name,
-            t.parent_id,
-            t.d_name,
+            max(t.org_code) as org_code,
+            max(t.org_name) as org_name,
+            max(t.parent_id) as parent_id,
+            max(t.d_name) AS d_name,
             MAX(t.`year`) AS `year`,
             SUM(t.use_count) AS use_count,
             SUM(t.fix_count) AS fix_count,
@@ -52,10 +61,10 @@
         FROM (
                  SELECT
                      org_id_int AS org_id,
-                     org_code,
-                     org_name,
-                     parent_id,
-                     org_name_short AS d_name,
+                     max(org_code) as org_code,
+                     max(org_name) as org_name,
+                     max(parent_id) as parent_id,
+                     max(org_name_short) AS d_name,
                      `year`,
                      `month`,
                      SUM(use_count) AS use_count,
@@ -76,19 +85,19 @@
             </foreach>
         </if>
 
-        GROUP BY org_id,org_code,org_name,parent_id, d_name,`year`,month
+        GROUP BY org_id,`year`,month
              ) AS t
         GROUP BY
-            t.org_id,t.org_code, t.org_name,t.parent_id,t.d_name
+            t.org_id
     </select>
     <select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto">
         select sum(use_count) as use_count,sum(fix_count) as fix_count,sum(number) as number FROM (
         SELECT
         t.org_id,
-        t.org_code,
-        t.org_name,
-        t.parent_id,
-        t.d_name,
+        max(t.org_code) as org_code,
+        max(t.org_name) as org_name,
+        max(t.parent_id) as parent_id,
+        max(t.d_name) AS d_name,
         MAX(t.`year`) AS `year`,
         SUM(t.use_count) AS use_count,
         SUM(t.fix_count) AS fix_count,
@@ -96,10 +105,10 @@
         FROM (
         SELECT
         org_id_int AS org_id,
-        org_code,
-        org_name,
-        parent_id,
-        org_name_short AS d_name,
+        max(org_code) as org_code,
+        max(org_name) as org_name,
+        max(parent_id) as parent_id,
+        max(org_name_short) AS d_name,
         `year`,
         `month`,
         SUM(use_count) AS use_count,
@@ -120,10 +129,10 @@
             </foreach>
         </if>
 
-        GROUP BY org_id,org_code,org_name,parent_id, d_name,`year`,month
+        GROUP BY org_id,`year`,month
         ) AS t
         GROUP BY
-        t.org_id,t.org_code, t.org_name,t.parent_id,t.d_name
+        t.org_id
             ) as a
     </select>
     <select id="TjOrgCountDetailSum" resultType="java.lang.Integer">
@@ -235,4 +244,29 @@
             limit #{pageNo},#{pageSize}
         </if>
     </select>
+    <select id="TjOrgCountByType" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"
+            parameterType="com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq">
+        select et.id as type_parent_id,a.org_id,max(a.org_name) as org_name,coalesce(sum(a.use_count),0) as use_count
+        FROM base_equipment_type et
+            LEFT JOIN
+               (select
+                    org_id_int AS org_id,
+                    max(org_name) as org_name,
+                    max(parent_id) as parent_id,
+                    max(org_name_short) AS d_name,
+                    `year`,
+                    SUM(use_count) AS use_count,
+                    type_parent_id
+                FROM vie_equipment_count_summary
+                where `year`= #{req.year} and org_id_int=#{req.orgId}
+                 <if test="req.monthList!=null and req.monthList.size() > 0">
+                     and month in
+                <foreach collection="req.monthList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                 </if>
+                GROUP BY org_id,type_parent_id) as a on a.type_parent_id=et.id
+        where TRIM(et.parent_ids )='' and et.id !="00000000-0000-0000-0000-000000000000"
+        GROUP BY et.id,a.org_id
+    </select>
 </mapper>

jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml

@@ -11,7 +11,7 @@
     t2.name AS eqName,
     t1.name AS name,
     t1.type_id as typeId,
-    t1.price,
+    t2.price,
     t1.code AS code,
     t3.name AS type3Name,
     t4.name AS type2name,

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -548,6 +548,23 @@
     <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
 
     </select>
+    <select id="alignInventoryInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto"
+            parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">
+        SELECT i.id,i.package_id,i.type_id,i.size_id,i.supplier_id,i.epc,
+               i.org_id_int as org_id,i.state as equ_state,i.bussiness_state,i.location_state as state,
+               i.production_date,i.warranty_period,i.maintenance_period,i.fix_count,i.location_id,i.location_type,i.lost_flag,
+               i.price,i.create_time,i.update_time,i.note,es.name as size_name,et.name as type_name,bs.name as supplier_name, bw.name as location_name
+        FROM `base_inventory` i
+                   join base_equipment_size es on i.size_id=es.id
+                   join base_equipment_type et on i.type_id=et.id
+                   join base_warehouse bw on bw.id=i.location_id
+                   join base_supplier bs on bs.id=i.supplier_id
+        where i.org_id_int=#{req.orgId}
+          <if test="req.locationId!= null and req.locationId != ''">
+              and i.location_id=#{req.locationId}
+          </if>
+          and i.update_time &gt; #{req.updateTime}
+    </select>
 
 
 </mapper>
\ No newline at end of file

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -289,7 +289,10 @@
         HAVING stockNumber>0
     </select>
     <select id="selectSumByItems" resultType="com.junmp.jyzb.entity.InventorySummary">
-        select * from base_inventory_summary where
+        select id,valuekey,org_id_int as org_id,org_name,org_code,type_id,type_name,size_id,size_name,location_id,location_name,location_type,
+               number,unit_price,price,stock_number,outbound_number,destruction_price,destruction_number,expire_number,expire_price,
+        broken_price,broken_number,near_broken_price,near_broken_number,use_number,agent_broken_num,fix_count,use_count,create_time,update_time,threshold
+               from base_inventory_summary  where
         <foreach collection="list" item="item" separator="or">
             (
             org_id_int = ${item[0]} AND location_id = '${item[1]}' AND type_id = ${item[2]} AND size_id = '${item[3]}'

jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml

@@ -42,4 +42,20 @@
         SELECT ls.location_name,ls.order_main_id,ls.out_in_state,ld.* FROM base_log_summary ls
             join base_log_detail ld on ld.summary_id=ls.id and ls.order_main_id=#{orderMainId}
     </select>
+    <select id="getInOutRecordsSize" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select count(*) FROM(
+        select ld.*,ls.location_name FROM base_log_detail ld
+            join base_log_summary ls on ls.id=ld.summary_id
+              where epc=#{epc}
+        ) as a
+    </select>
+    <select id="getInOutRecords" resultType="com.junmp.jyzb.entity.LogDetail">
+        select ld.*,ls.location_name FROM base_log_detail ld
+            join base_log_summary ls on ls.id=ld.summary_id
+            where epc=#{epc}
+        <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
+            limit #{pageNo},#{pageSize}
+        </if>
+
+    </select>
 </mapper>

jyzb-biz/src/main/resources/mapper/WarehouseDevMapper.xml

+<?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.junmp.jyzb.mapper.WarehouseDevMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.WarehouseDev">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="warehouseId" column="warehouse_id" jdbcType="VARCHAR"/>
+            <result property="devIp" column="dev_ip" jdbcType="VARCHAR"/>
+            <result property="devPort" column="dev_port" jdbcType="VARCHAR"/>
+            <result property="devName" column="dev_name" jdbcType="VARCHAR"/>
+            <result property="devCode" column="dev_code" jdbcType="VARCHAR"/>
+            <result property="warehouseSd" column="warehouse_sd" jdbcType="VARCHAR"/>
+            <result property="warehouseWd" column="warehouse_wd" jdbcType="VARCHAR"/>
+            <result property="setState" column="set_state" jdbcType="VARCHAR"/>
+            <result property="devState" column="dev_state" jdbcType="INTEGER"/>
+            <result property="setSd" column="set_sd" jdbcType="INTEGER"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,warehouse_id,dev_ip,
+        dev_port,dev_name,dev_code,
+        warehouse_sd,warehouse_wd,set_state,
+        dev_state,set_sd,create_time,
+        update_time
+    </sql>
+    <select id="showWarehouseDevList" resultType="com.junmp.jyzb.entity.WarehouseDev"
+            parameterType="com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq">
+        select wd.*,po.org_name as org_name, bw.name as warehouse_name FROM base_warehouse_dev wd
+            join pub_org po on po.org_id=wd.org_id
+            left join base_warehouse bw on bw.id=wd.warehouse_id
+            where wd.org_id=#{req.orgId}
+        <if test="req.devName !=null and req.devName !=''">
+            and wd.dev_name =#{req.devName}
+        </if>
+        <if test="req.devCode !=null and req.devCode !=''">
+            and wd.dev_code =#{req.devCode}
+        </if>
+    </select>
+</mapper>