Skip to content

J
jyzb_platformV2
Commit 9261ff87 by 李小惠
Options

修改统计报表，新增修改密码

parent bbdd0281
正在显示 包含 264 行增加 和 47 行删除
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/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/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-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
......@@ -21,6 +21,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 +92,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));
}
......
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,13 @@ 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));
}
/**
* --------------------------------------人员统计报表-------------------------------------------
*/
......
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/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/mapper/EquipmentCountSummaryMapper.java
......@@ -16,7 +16,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 +38,8 @@ 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);
}
......
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/service/PolicemanService.java
......@@ -13,6 +13,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 +105,8 @@ public interface PolicemanService extends IService<Policeman> {
List<PolicemanDto> getPoliceWithoutOrg();
UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req);
boolean reSetPassword(SysUserReq req);
boolean updatePassword(SysUserReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
......@@ -40,4 +40,6 @@ public interface TjService {
PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req);
boolean updateTjOrgCount(TjOrgCountReq req);
}
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/InventorySummaryServiceImpl.java
......@@ -346,9 +346,12 @@ 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();
}
......
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
......@@ -43,6 +43,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;
......@@ -135,6 +136,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 +366,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 +390,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);
}
......@@ -1283,7 +1291,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} catch (Exception var3) {
throw new ServiceException(PublicExceptionEnum.FILE_DEL_FAILTURE);
}
}
//上传照片
sysFileInfoReq.setFileBucket("jyzb");
......@@ -1300,5 +1307,40 @@ 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 = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
.eq(Policeman::getUserId, req.getUserId()));
if (ObjectUtil.isNotNull(one)){
one.setPassword(password);
policemanService.updateById(one);
}
return true;
}
//修改密码
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updatePassword(SysUserReq req) {
Policeman one = policemanService.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);
policemanService.updateById(one);
}
sysUserService.editPassword(req);
return true;
}
}
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,12 @@ public class TjServiceImpl implements TjService {
req.getTypeIdsList(),req.getSizeNameList(),null,null);
return returnList;
}
}
@Override
public boolean updateTjOrgCount(TjOrgCountReq req) {
String sql=" org_id_int = "+"'"+req.getOrgId()+"'";
equipmentCountSummaryMapper.deleteAll(req.getOrgId());
equipmentCountSummaryMapper.addInfo(sql);
return true;
}
}
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/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">
......
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/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>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论