Skip to content

J
jyzb_platformV2
Commit 67d1bc33 by 赵剑炜
Options

调整全部单警柜代码

parent e9d71883
正在显示 包含 14 行增加 和 669 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
......@@ -77,12 +77,7 @@ public class CabinetController {
return ApiRes.success(cabinetService.showOneCabinet(req));
}
@PostMapping("/GetCabinetByOrgId")
@ApiOperation("根据组织机构获取单警柜及箱号信息")
public ResponseResult getCabinetByOrgId(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = cabinetService.getCabinetByOrgId(msg);
return returnMsg;
}
@PostMapping("/ShowCabinetList")
@ApiOperation("查询单警柜列表")
public ApiRes<List<CabinetDto>> showCabinetList(@RequestBody CabinetReq req){
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
......@@ -66,12 +66,7 @@ public class PoliceController {
return ApiRes.success(b);
}
@PostMapping("/ShowPolice")
@ApiOperation("查询警员列表") //根据组织机构id查询
public ResponseResult getAllPoliceman(@RequestBody Map<String, Object> orgId){
ResponseResult returnMsg = policemanService.getAllPoliceman(orgId);
return returnMsg;
}
//根据组织机构id查询,只查询本级，不包含下级
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java
......@@ -12,42 +12,8 @@ import java.util.Map;
@Mapper
public interface CabinetMapper extends BaseMapper<Cabinet> {
public int addCabinet(Cabinet cabinet);
List<Cabinet> getAllCabinetByOrgList(@Param("allOrgId") List<String> allOrgId);
public List<Cabinet> getAllCabinet();
public List<Cabinet> getAllCabinetList();
Map<String, Object> getOneCabinet(String id);
void updateCabinet(Cabinet cabinet);
List<String> getAllCabinetId(String orgId);
void changeCabinetState(Cabinet cabinet);
List<String> getAllCabinetBoxId(String id);
List<String> getAllCabinetIdByHighest();
String getCabinetNumById(String id);
List<Cabinet> getAllCabinetByOrgList(List<String> allOrgId);
void setCabinetSumInventory(@Param("updateId") String id);
void setCabinetInSumInventory(@Param("updateId") String id);
void setCabinetOutSumInventory(@Param("updateId") String id);
void setCabinetPriceInventory(@Param("updateId") String id);
List<Map<String, Object>> getCabinetByOrgId(String orgId);
String getOrgByCabinet(String cabinetId);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PoliceFingerMapper.java
......@@ -11,9 +11,4 @@ import java.util.Map;
@Mapper
public interface PoliceFingerMapper extends BaseMapper<PoliceFinger> {
List<Map<String, Object>> getFingersByUserId(String userId);
void addFingers(PoliceFinger fingers);
void updateFingers(PoliceFinger finger);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
......@@ -13,27 +13,8 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
Map<String, Object> getOnePolice(String id);
List<String> getAllPoliceId(String orgId);
void deleteFinger(String fingerId);
List<String> getAllPoliceIdByBoxId(String boxId);
void addFaceInfo(Policeman police);
List<String> getChildren(String id);
List<String> getAllBoxIdByCabinet(String cabinetId);
List<Map<String,Object>> getAllPolice();
List<String> getAllPoliceIdByHighest();
String getPoliceCodeById(String id);
List<Map<String, Object>> getAllPolicemanByOrg(String orgId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetBoxService.java
......@@ -11,8 +11,6 @@ import java.util.Map;
public interface CabinetBoxService extends IService<CabinetBox> {
List<Map<String, Object>> getAllBoxMsg(String id);
List<CabinetBox> getCabinetBoxList(CabinetReq req);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetService.java
......@@ -14,17 +14,6 @@ import java.util.Map;
public interface CabinetService extends IService<Cabinet> {
List<String> getAllCabinetId(Map<String, Object> orgId);
Map<String, Object> getOneCabinet(String cabinetId);
List<String> getAllCabinetBoxId(String id);
ResponseResult setCabinetInventory(Map<String, Object> msg);
/**
......@@ -71,12 +60,6 @@ public interface CabinetService extends IService<Cabinet> {
*/
boolean boxBindPolice(CabinetBoxReq req);
/**
* 根据组织机构获取单警柜及箱号信息
* @param msg
* @return
*/
ResponseResult getCabinetByOrgId(Map<String, Object> msg);
/**
* 修改单警柜箱门状态
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceFingerService.java
......@@ -11,8 +11,6 @@ import java.util.Map;
public interface PoliceFingerService extends IService<PoliceFinger> {
List<Map<String, Object>> getFingersByUserId(String userId);
/**
* 新增指纹信息
* @param req
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
......@@ -28,10 +28,6 @@ public interface PolicemanService extends IService<Policeman> {
//修改警员信息
boolean UpdatePolice(UpdatePolicemanReq req);
List<String> getAllPoliceId(Map<String, Object> orgId);
List<String> getAllPoliceIdByCabinet(Map<String, Object> cabinetId);
boolean AddFaceInfo(PolicemanReq req);
......@@ -39,9 +35,6 @@ public interface PolicemanService extends IService<Policeman> {
//修改警员状态
boolean ChangePoliceState(UpdatePolicemanReq req);
//List<Map<String, Object>> getAllPoliceman(List<String> allPoliceId);
ResponseResult getAllPoliceman(Map<String, Object> orgId);
//通过组织机构id查询警员列表
PoliceDto GetAllPolicemanList(Long orgId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxServiceImpl.java
......@@ -33,21 +33,8 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
private CabinetBoxMapper cabinetBoxMapper;
@Resource
private CabinetBoxService cabinetBoxService;
@Resource
private PolicemanMapper policemanMapper;
@Resource
private PoliceFingerMapper policeFingerMapper;
@Resource
private CabinetService cabinetService;
@Override
public List<Map<String, Object>> getAllBoxMsg(String id) {
return cabinetBoxMapper.getBoxMsg(id);
}
/**
* @author lxh
......@@ -58,7 +45,7 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
**/
@Override
public List<CabinetBox> getCabinetBoxList(CabinetReq req) {
List<CabinetBox> cabinetBoxList = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
List<CabinetBox> cabinetBoxList = this.list(new LambdaQueryWrapper<CabinetBox>()
.eq(ObjectUtil.isNotEmpty(req.getId()),CabinetBox::getCabinetId, req.getId()));
return cabinetBoxList;
}
......@@ -67,7 +54,7 @@ public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, Cabinet
@Override
@Transactional(rollbackFor = Exception.class)
public boolean AddBoxInfo(UpdateCabinetBoxReq req) {
CabinetBox one = cabinetBoxService.getOne(new LambdaQueryWrapper<CabinetBox>()
CabinetBox one = this.getOne(new LambdaQueryWrapper<CabinetBox>()
.eq(CabinetBox::getId, req.getId()));
if (ObjectUtil.isNotNull(one)){
throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_IS_EXISTS);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java
......@@ -37,22 +37,11 @@ import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> implements CabinetService {
@Resource
private RedisUtils redisUtils;
@Resource
private CabinetMapper cabinetMapper;
@Resource
private CabinetBoxMapper cabinetBoxMapper;
@Resource
private PolicemanMapper policemanMapper;
@Resource
private PubOrgMapper pubOrgMapper;
@Resource
private PubOrgService pubOrgService;
@Resource
private CabinetBoxService cabinetBoxService;
......@@ -60,38 +49,9 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
@Resource
private PolicemanService policemanService;
private static final String REDIS_CABINET = "Cabinet_";
@Override
public Map<String, Object> getOneCabinet(String id) {
return cabinetMapper.getOneCabinet(id);
}
//查询某组织机构的所有子机构
public List<String> getSubIds(String id) {
List<String> subIds = new ArrayList<>();
subIds.add(id);//先往List中放入父级id
List<String> subMenus = policemanMapper.getChildren(id);//查询该id的子类id
if (subMenus != null) {
for (String subMenu : subMenus) {
subIds.addAll(getSubIds(subMenu));
}
}
return subIds;
}
@Override
public List<String> getAllCabinetBoxId(String id) {
List<String> msg = cabinetMapper.getAllCabinetBoxId(id);
return msg;
}
private List<String> getAllOrgId(CabinetReq req, String includeLowerLevel) {
......@@ -111,45 +71,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
return allCabinet;
}
@Override
public List<String> getAllCabinetId(Map<String, Object> msg) {
//如果组织机构是最高级的，获取所有id
if (msg.get("orgId").toString().equals("1369509498032808905")) {
//构建 Redis 缓存键
String redisKey = "getAllCabinetId_" + msg.get("IncludeLowerLevel") + '_' + msg.get("orgId");
// 从 Redis 中获取数据
List<String> cachedData = redisUtils.findCachedData(redisKey);
if (cachedData != null) {
return cachedData;
}
List<String> allCabinetId = cabinetMapper.getAllCabinetIdByHighest();
//将查询结果存入 Redis 中
redisUtils.set(redisKey, allCabinetId);
return allCabinetId;
}
//构建 Redis 缓存键
String redisKey = "getAllCabinetId_" + msg.get("IncludeLowerLevel") + '_' + msg.get("orgId");
// 从 Redis 中获取数据
List<String> cachedData = redisUtils.findCachedData(redisKey);
if (cachedData != null) {
return cachedData;
}
List<String> cabinetId = new ArrayList<>();
if (msg.get("IncludeLowerLevel").equals("false")) {
cabinetId = cabinetMapper.getAllCabinetId(msg.get("orgId").toString());
} else {
List<String> orgIds = getSubIds(msg.get("orgId").toString()); //调用本级及下级的所有组织机构的id
for (String orgId : orgIds) {
List<String> allPoliceId = cabinetMapper.getAllCabinetId(orgId);
cabinetId.addAll(allPoliceId);
}
}
//将查询结果存入 Redis 中
redisUtils.set(redisKey, cabinetId);
return cabinetId;
}
public ResponseResult setCabinetInventory(Map<String, Object> msg) {
String id;
......@@ -159,13 +80,13 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
id = null;
}
//统计仓库 装备总数
cabinetMapper.setCabinetSumInventory(id);
//统计仓库 装备在库总数
cabinetMapper.setCabinetInSumInventory(id);
//统计仓库 装备出库总数
cabinetMapper.setCabinetOutSumInventory(id);
//统计仓库 装备出库总数
cabinetMapper.setCabinetPriceInventory(id);
// cabinetMapper.setCabinetSumInventory(id);
// //统计仓库 装备在库总数
// cabinetMapper.setCabinetInSumInventory(id);
// //统计仓库 装备出库总数
// cabinetMapper.setCabinetOutSumInventory(id);
// //统计仓库 装备出库总数
// cabinetMapper.setCabinetPriceInventory(id);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
......@@ -283,7 +204,8 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
List<CabinetBoxDto> cabinetBoxList=new ArrayList<>();
//如果组织机构时浙江省公安厅
if (req.getOrgId().equals("1369509498032808905") && req.getIncludeLowerLevel().equals("true")) {
cabinets = cabinetMapper.getAllCabinet();
cabinets = this.list(new LambdaQueryWrapper<Cabinet>()
.eq(Cabinet::getOrgId, req.getOrgId()));
for (Cabinet cabinet:cabinets) {
CabinetDto cabinetDto = new CabinetDto();
BeanPlusUtil.copyProperties(cabinet,cabinetDto);
......@@ -433,29 +355,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
return policemanService.updateById(one2);
}
@Override
public ResponseResult getCabinetByOrgId(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
}
// 根据组织机构获取该组织机构下所有单警柜
List<Map<String,Object>> allCabinet = new ArrayList<>();
allCabinet = cabinetMapper.getCabinetByOrgId(msg.get("orgId").toString());
// 遍历allCabinet
for (Map<String,Object> oneCabinet:allCabinet){
String cabinetId = oneCabinet.get("id").toString();
// 根据单警柜id获取箱号信息
List<Map<String,Object>> allBox = new ArrayList<>();
allBox = cabinetBoxMapper.getBoxMsg(cabinetId);
oneCabinet.put("allBoxMsg",allBox);
}
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
}
/**
* 修改单警柜箱门状态
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PoliceFingerServiceImpl.java
......@@ -29,10 +29,6 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
@Resource
private PoliceFingerMapper policeFingerMapper;
@Override
public List<Map<String, Object>> getFingersByUserId(String userId) {
return policeFingerMapper.getFingersByUserId(userId);
}
//新增指纹信息
@Override
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -40,18 +40,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
private PolicemanMapper policemanMapper;
@Resource
private PoliceFingerMapper policeFingerMapper;
@Resource
private CabinetBoxMapper cabinetBoxMapper;
@Resource
private CabinetMapper cabinetMapper;
@Resource
private PubOrgMapper pubOrgMapper;
@Resource
private PubOrgService pubOrgService;
@Resource
......@@ -69,8 +57,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
@Resource
private SysuserService sysUserService;
private static final String REDIS_POLICE = "Policeman_";
private static final String REDIS_ORG = "Organization_";
/**
......@@ -101,41 +87,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return policeman.getId();
}
// 更新缓存的方法，新增警员信息时调用
private void updatePoliceIdCache(String orgId, String newPoliceId) {
// 构建 Redis 缓存键
String redisKeyFalse = "getAllPoliceId_false_" + orgId;
String redisKeyTrue = "getAllPoliceId_true_" + orgId;
// 从 Redis 中获取旧的缓存数据
List<String> cachedDataFalse = redisUtils.findCachedData(redisKeyFalse);
List<String> cachedDataTrue = redisUtils.findCachedData(redisKeyTrue);
//如果缓存中没有数据，则直接查询数据库并更新Redis缓存
//如果缓存中有数据，就更新数据
if (cachedDataFalse == null && cachedDataTrue == null) {
//getAllPoliceId(Map.of("IncludeLowerLevel", false, "orgId", orgId));
return;
}else if(cachedDataFalse!=null){
cachedDataFalse.add(newPoliceId);
redisUtils.set(redisKeyFalse, cachedDataFalse);
}else if(cachedDataTrue!=null){
cachedDataTrue.add(newPoliceId);
redisUtils.set(redisKeyTrue, cachedDataTrue);
}
}
//删除缓存的方法
private void deletePoliceIdCache(String orgId){
//构建 Redis 缓存键
String redisKey = "getAllPoliceId_false_" + orgId;
redisUtils.delete(redisKey);
//构建 Redis 缓存键
redisKey = "getAllPoliceId_true_" + orgId;
redisUtils.delete(redisKey);
}
/**
*
......@@ -230,61 +181,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return policemanService.updateById(policeman);
}
@Override
public List<String> getAllPoliceId(Map<String, Object> msg) {
//构建 Redis 缓存键
String redisKey = "getAllPoliceId_"+msg.get("IncludeLowerLevel")+'_'+msg.get("orgId");
// 从 Redis 中获取数据
List<String> cachedData = redisUtils.findCachedData(redisKey);
if (cachedData!=null){
return cachedData;
}
List<String> policeId = new ArrayList<>();
if (msg.get("IncludeLowerLevel").equals("false")){
policeId = policemanMapper.getAllPoliceId(msg.get("orgId").toString());
}else if(msg.get("IncludeLowerLevel").equals("true")){
//查询某组织机构的本级及下级
List<String> orgIds = getSubIds(msg.get("orgId").toString()); //调用本级及下级的所有组织机构的id
for (String orgId:orgIds){
//String redisKey = REDIS_ORG + orgId;
List<String> allPoliceId = policemanMapper.getAllPoliceId(orgId);
policeId.addAll(allPoliceId);
}
}else {
//填入的IncludeLowerLevel不正确
return null;
}
//将查询结果存入 Redis 中
redisUtils.set(redisKey, policeId);
return policeId;
}
//查询某组织机构的所有子机构
public List<String> getSubIds(String id) {
List<String> subIds = new ArrayList<>();
subIds.add(id);//先往List中放入父级id
List<String> subMenus = policemanMapper.getChildren(id);//查询该id的子类id
if (subMenus != null) {
for (String subMenu : subMenus) {
subIds.addAll(getSubIds(subMenu));
}
}
return subIds;
}
@Override
public List<String> getAllPoliceIdByCabinet(Map<String, Object> cabinetId) {
//根据单警柜id找到所有的箱号id
List<String> msg = policemanMapper.getAllBoxIdByCabinet(cabinetId.get("cabinetId").toString());
//遍历所有的箱号id,根据箱号id查询所有的警员信息
List<String> boxId = new ArrayList<>();
for (String id:msg){
policemanMapper.getAllPoliceIdByBoxId(id);
}
return boxId;
}
......@@ -306,62 +204,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
}
public List<Map<String, Object>> getAllPolicemanMsg(Map<String, Object> msg,List<String> allPoliceId) {
List<Map<String, Object>> allPoliceman = new ArrayList<>();
// 构建 Redis 缓存键
String redisKey = REDIS_ORG + msg.get("IncludeLowerLevel").toString() +'_'+ msg.get("orgId").toString();
// 从 Redis 中获取数据
List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
if (cachedData != null) {
//将Long类型的数据转化为Date
for (Map<String,Object> one:cachedData){
Long dataMsg = (Long) one.get("updateTime");
one.put("updateTime", redisUtils.getDate(dataMsg));
allPoliceman.add(one);
}
return cachedData;
}
for (String policeId : allPoliceId) {
Map<String, Object> policeMsg = policemanMapper.getOnePolice(policeId);
allPoliceman.add(policeMsg);
}
//按照updateTime降序排序
DateTimeUtil.timeSort(allPoliceman);
//将查询结果存入 Redis 中
redisUtils.set(redisKey, allPoliceman);
return allPoliceman;
}
@Override
public ResponseResult getAllPoliceman(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<Map<String, Object>> allPoliceman = new ArrayList<>();
//如果组织机构是浙江省公安厅
if (msg.get("orgId").toString().equals("1369509498032808905") && msg.get("IncludeLowerLevel").toString().equals("true")){
allPoliceman = policemanMapper.getAllPolice();
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allPoliceman);
}
//获取组织机构Id
List<String> allOrgId =getAllOrgId(msg);
if (allOrgId.isEmpty()){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"未查询到相关信息");
}
//根据获取的组织机构查询警员信息
allPoliceman = getAllPolicemanByOrg(msg,allOrgId);
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",allPoliceman);
}
/**
* 通过组织机构id查询警员列表
* @param orgId
......@@ -404,23 +246,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return policeDto;
}
private List<Map<String, Object>> getAllPolicemanByOrg(Map<String, Object> msg, List<String> allOrgId) {
List<Map<String, Object>> allPoliceman = new ArrayList<>();
allPoliceman = policemanMapper.getAllPolicemanByOrgList(allOrgId);
return allPoliceman;
}
private List<String> getAllOrgId(Map<String, Object> msg) {
List<String> allOrg = new ArrayList<>();
if (msg.get("IncludeLowerLevel").equals("false")){
allOrg.add((String) msg.get("orgId"));
}else if(msg.get("IncludeLowerLevel").equals("true")){
//查询某组织机构的本级及下级
allOrg = pubOrgService.getLowerOrg(msg.get("orgId").toString());
}
return allOrg;
}
//根据单警柜id查询警员信息
@Override
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java
......@@ -26,28 +26,13 @@ import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Slf4j
public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse> implements WarehouseService {
@Resource
private RedisUtils redisUtils;
@Resource
private WarehouseMapper warehouseMapper;
@Resource
private PolicemanMapper policemanMapper;
@Resource
private PubOrgMapper pubOrgMapper;
@Resource
private ShelfMapper shelfMapper;
@Resource
private PubOrgService pubOrgService;
@Resource
private WarehouseAreaMapper areaMapper;
private static final String REDIS_WAREHOUSE = "Warehouse_";
@Override
......@@ -83,17 +68,6 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
}
public List<String> getSubIds(String id) {
List<String> subIds = new ArrayList<>();
subIds.add(id);
List<String> subMenus = policemanMapper.getChildren(id);//查询该id的子类id
if (subMenus != null) {
for (String subMenu : subMenus) {
subIds.addAll(getSubIds(subMenu));
}
}
return subIds;
}
@Override
public List<Warehouse> getAllWarehouse(WarehouseReq msg) {
......
jyzb-biz/src/main/resources/mapper/CabinetMapper.xml
......@@ -31,80 +31,7 @@
create_user, update_user
</sql>
<insert id="addCabinet" parameterType="com.junmp.jyzb.entity.Warehouse">
insert into base_cabinet
(id,cabinet_num,name,org_id,location,state,num,create_time,update_time)
values
(#{id},#{cabinetNum},#{name},#{orgId},#{location},1,#{num},#{createTime},#{updateTime})
</insert>
<select id="getOneCabinet" resultType="Map">
select
c.id,
c.cabinet_num as cabinetNum,
c.name,
o.org_id as orgId,
o.org_name as orgName,
c.location,
c.state,
c.update_time as updateTime
from base_cabinet c,pub_org o
where c.id=#{id} and c.org_id_int =o.org_id
</select>
<update id="updateCabinet">
update base_cabinet p
set cabinet_num = #{cabinetNum},name=#{name},location=#{location},update_time=#{updateTime},org_id_int=#{orgId}
where p.id =#{id}
</update>
<select id="getAllCabinet" resultMap="BaseCabinetResultMap" >
select
c.id,
c.cabinet_num as cabinetNum,
c.name,
o.org_id as orgId,
o.org_name as orgName,
c.location,
c.state,
c.update_time as updateTime,
c.sum as sum,
c.in_sum as inSum,
c.out_sum as outSum
from base_cabinet c
left join pub_org o on c.org_id_int =o.org_id
</select>
<select id="getAllCabinetId" resultType="String">
select id
from base_cabinet w
where org_id=#{orgId};
</select>
<update id="changeCabinetState">
update base_cabinet c
set state = #{state}
where c.id =#{id}
</update>
<select id="getAllCabinetBoxId" resultType="String">
select id
from base_cabinet_box b
where cabinet_id=#{id}
</select>
<select id="getAllCabinetIdByHighest" resultType="String">
select id
from base_cabinet w
</select>
<select id="getCabinetNumById" resultType="java.lang.String">
select cabinet_num from base_cabinet where id =#{id}
</select>
<select id="getAllCabinetByOrgList" parameterType="java.util.List" resultType="com.junmp.jyzb.entity.Cabinet">
select
......@@ -126,107 +53,6 @@
#{item}
</foreach>
</select>
<select id="getAllCabinetList" resultType="com.junmp.jyzb.entity.Cabinet">
select
c.id,
c.cabinet_num as cabinetNum,
c.name,
o.org_id as orgId,
o.org_name as orgName,
c.location,
c.state,
c.update_time as updateTime,
c.sum as sum,
c.in_sum as inSum,
c.out_sum as outSum
from base_cabinet c
left join pub_org o on c.org_id_int =o.org_id
where c.org_id_int in
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<update id="setCabinetSumInventory">
UPDATE base_cabinet AS c
SET sum = (
SELECT count(i.id)
FROM base_cabinet_box AS b
JOIN base_AS i ON b.id = i.location_id
WHERE b.cabinet_id = c.id
)
<if test="updateId != null and updateId != ''">
where c.id = #{updateId}
</if>
</update>
<update id="setCabinetInSumInventory">
UPDATE base_cabinet AS c
JOIN (
SELECT b.cabinet_id, COUNT(i.id) AS total_count
FROM base_cabinet_box AS b
JOIN base_inventory AS i ON b.id = i.location_id
WHERE i.location_state = 'in'
GROUP BY b.cabinet_id
) AS subquery ON c.id = subquery.cabinet_id
SET c.in_sum = subquery.total_count
<if test="updateId != null and updateId != ''">
where c.id = #{updateId}
</if>
</update>
<update id="setCabinetOutSumInventory">
UPDATE base_cabinet AS c
SET out_sum = (
SELECT count(i.id)
FROM base_cabinet_box AS b
JOIN base_inventory AS i ON b.id = i.location_id
WHERE b.cabinet_id = c.id and i.location_state="out"
)
<if test="updateId != null and updateId != ''">
where c.id = #{updateId}
</if>
</update>
<update id="setCabinetPriceInventory">
UPDATE base_cabinet AS c
SET price_total = (
SELECT sum(price)
FROM base_cabinet_box AS b
JOIN base_inventory AS i ON b.id = i.location_id
WHERE b.cabinet_id = c.id
)
<if test="updateId != null and updateId != ''">
where c.id = #{updateId}
</if>
</update>
<select id="getOrgByCabinet" resultType="String">
select
o.org_id
from base_cabinet c
join pub_org o on c.org_id_int =o.org_id
where c.id = #{cabinetId}
</select>
<select id="getCabinetByOrgId" resultType="map">
select
c.id,
c.cabinet_num as cabinetNum,
c.name,
o.org_id as orgId,
o.org_name as orgName,
c.location,
c.state,
c.update_time as updateTime,
c.sum as sum,
c.in_sum as inSum,
c.out_sum as outSum
from base_cabinet c
left join pub_org o on c.org_id_int =o.org_id
where c.org_id_int = #{orgId}
</select>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/PoliceFingerMapper.xml
......@@ -8,23 +8,5 @@
id, police_id, finger_info, create_time, update_time
</sql>
<select id="getFingersByUserId" parameterType="String" resultType="java.util.Map">
SELECT f.id as fingerId,f.name,f.finger_info as fingerInfo
FROM base_police_finger f
WHERE f.police_id = #{userId}
</select>
<insert id="addFingers">
insert into base_police_finger
(police_id,name,finger_info,create_time,update_time)
VALUES
(#{policeId},#{name},#{fingerInfo},#{createTime},update_time)
</insert>
<update id="updateFingers">
update base_police_finger p
set name = #{name},finger_info=#{fingerInfo},update_time=#{updateTime}
where p.id =#{id}
</update>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -94,50 +94,6 @@
<!-- and delete_flag=0-->
<!-- </select>-->
<select id="getAllPoliceId" resultType="String">
select id
from base_policeman p
where org_id_int=#{orgId}
</select>
<select id="getAllPoliceIdByHighest" resultType="String">
select id
from base_policeman p
</select>
<delete id="deleteFinger">
delete from base_police_finger
where id =#{fingerId}
</delete>
<select id="getAllPoliceIdByBoxId" resultType="String">
select id
from base_policeman p
where cabinet_box_id=#{boxId}
</select>
<update id="addFaceInfo" parameterType="com.junmp.jyzb.entity.Policeman">
update base_policeman p
set face_info=#{faceInfo},update_time=#{updateTime}
where p.id=#{id}
</update>
<select id="getChildren" resultType="String">
select org_id from pub_org where org_parent_id = #{id}
</select>
<select id="getAllBoxIdByCabinet" resultType="String">
select id
from base_cabinet_box b
where cabinet_id=#{cabinetId}
</select>
<select id="getPoliceCodeById" resultType="java.lang.String">
select police_code from base_policeman where id =#{id}
</select>
<select id="getAllPolicemanByOrg" resultType="Map">
SELECT
p.id AS id,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论