Commit a4a78d44 authored by suhuiguang's avatar suhuiguang

1.安全值守使用单位慢,增加监管单位与使用单位联动及优化接口查询速度

parent 39e1379d
...@@ -44,6 +44,8 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI ...@@ -44,6 +44,8 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
String getOrgCodeByCompanyCode(String companyCode); String getOrgCodeByCompanyCode(String companyCode);
String getOrgCodeByCompanySeq(@Param("companySeq") String companySeq);
IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto); IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
IPage<TzBaseEnterpriseInfoDto> pageList(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, List orgCodeList); IPage<TzBaseEnterpriseInfoDto> pageList(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, List orgCodeList);
......
...@@ -171,5 +171,8 @@ ...@@ -171,5 +171,8 @@
<select id="getOrgCodeByCompanyCode" resultType="java.lang.String"> <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
select org_code from privilege_company where company_code = #{companyCode} limit 1 select org_code from privilege_company where company_code = #{companyCode} limit 1
</select> </select>
<select id="getOrgCodeByCompanySeq" resultType="java.lang.String">
select org_code from privilege_company where sequence_nbr = #{companySeq}
</select>
</mapper> </mapper>
package com.yeejoin.amos.boot.module.jczs.biz.controller; package com.yeejoin.amos.boot.module.jczs.biz.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
...@@ -12,6 +14,7 @@ import com.yeejoin.amos.boot.module.jczs.api.dto.EquEnterDto; ...@@ -12,6 +14,7 @@ import com.yeejoin.amos.boot.module.jczs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.jczs.api.dto.TzBaseEnterpriseInfoDto; import com.yeejoin.amos.boot.module.jczs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.jczs.api.entity.PageParam; import com.yeejoin.amos.boot.module.jczs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.jczs.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.jczs.api.service.ITzBaseEnterpriseInfoService; import com.yeejoin.amos.boot.module.jczs.api.service.ITzBaseEnterpriseInfoService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -48,6 +51,9 @@ public class TzBaseEnterpriseInfoController { ...@@ -48,6 +51,9 @@ public class TzBaseEnterpriseInfoController {
ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService; ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
@Autowired @Autowired
TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
@Autowired
RedisUtils redisUtils; RedisUtils redisUtils;
/** /**
...@@ -149,6 +155,21 @@ public class TzBaseEnterpriseInfoController { ...@@ -149,6 +155,21 @@ public class TzBaseEnterpriseInfoController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/listBySupervise", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "查询指定监管单位下的单位,包括本级监管单位及下级", notes = "查询指定监管单位下的单位")
public ResponseModel<List<TzBaseEnterpriseInfo>> getUnitList(@RequestParam(required = false) String superviseCompanySeq) {
LambdaQueryWrapper<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoQueryWrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotEmpty(superviseCompanySeq)){
String orgCode = baseEnterpriseInfoMapper.getOrgCodeByCompanySeq(superviseCompanySeq);
tzBaseEnterpriseInfoQueryWrapper.likeRight(StringUtils.isNotEmpty(orgCode), TzBaseEnterpriseInfo::getSuperviseOrgCode, orgCode);
}
tzBaseEnterpriseInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
tzBaseEnterpriseInfoQueryWrapper.select(BaseEntity::getSequenceNbr,TzBaseEnterpriseInfo::getUseUnit, TzBaseEnterpriseInfo::getUseUnitCode);
List<TzBaseEnterpriseInfo> units = iTzBaseEnterpriseInfoService.list(tzBaseEnterpriseInfoQueryWrapper);
return ResponseHelper.buildResponse(units);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getEquInfo/{sequenceNbr}", method = RequestMethod.GET) @RequestMapping(value = "/getEquInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "通过企业id查询设备", notes = "通过企业id查询设备") @ApiOperation(httpMethod = "GET", value = "通过企业id查询设备", notes = "通过企业id查询设备")
public ResponseModel<List<EquEnterDto>> getInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr) { public ResponseModel<List<EquEnterDto>> getInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment