资源管理修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/ElevatorDto.java

@@ -225,4 +225,7 @@ public class ElevatorDto extends BaseDto {
     private ElevatorInsureDto elevatorInsureDto;
 
     List<String> ids;
+
+    @ApiModelProperty(value = "监管单位code")
+    private String orgCode;
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/MaintenanceUnitNameDto.java

@@ -23,6 +23,6 @@ public class MaintenanceUnitNameDto extends BaseEntity {
     private int sequence_nbr;
 
     @ApiModelProperty(value = "维护保养单位名称")
-    private String unitName;
+    private String useUnit;
 
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/RescueStationDto.java

@@ -75,4 +75,10 @@ public class RescueStationDto extends BaseDto {
 
     @ApiModelProperty(value = "人员信息")
     List<DutyPersonDto> dutyPersonList;
+
+    @ApiModelProperty(value = "监管单位code")
+    private String orgCode;
+
+    @ApiModelProperty(value = "适用于监管单位code")
+    private String codeOrg;
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/RescueStationMapper.java

 package com.yeejoin.amos.boot.module.elevator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.elevator.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +25,6 @@ public interface RescueStationMapper extends BaseMapper<RescueStation> {
     List<RescueStationDto> getListByLatLonDistance(String lat, String lon, Integer distance);
 
     List<RescueStationDto> selectExportData(@Param("ids") List<String> ids);
+
+    IPage<RescueStation> getRescueStationList(@Param("page") IPage<RescueStation> page,@Param("dto") RescueStationDto dto);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IRescueStationService.java

 package com.yeejoin.amos.boot.module.elevator.api.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.elevator.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
@@ -7,15 +9,16 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
 import java.util.List;
 
 /**
-*  服务类
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * 服务类
+ *
+ * @author tb
+ * @date 2021-06-01
+ */
 public interface IRescueStationService extends IService<RescueStation> {
 
     /**
      * 根据经纬度和距离反馈救援机构列表
+     *
      * @param lat
      * @param lon
      * @param distance 单位为千米
@@ -24,4 +27,6 @@ public interface IRescueStationService extends IService<RescueStation> {
     List<RescueStationDto> getListByLatLonDistance(String lat, String lon, Integer distance);
 
     List<RescueStationDto> selectExportData(String exportId);
+
+    IPage<RescueStation> getRescueStationList(IPage<RescueStation> page, RescueStationDto rescueStationDto);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -109,8 +109,17 @@
         LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
         LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
         LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
+        LEFT JOIN idx_biz_jg_supervision_info ibjsi on jui.RECORD = ibjsi.RECORD
         <where>
-             jri.EQU_LIST = '3000'  AND joi.CLAIM_STATUS = '已认领' and  jui.RECORD is not null
+             jri.EQU_LIST = '3000'
+            AND joi.CLAIM_STATUS = '已认领'
+            AND jui.RECORD is not null
+            <if test="dto.orgCode != '50*18667'">
+                AND  ibjsi.ORG_BRANCH_CODE like concat(#{dto.orgCode},'%')
+            </if>
+            <if test="dto.orgCode == '50*18667'">
+                AND ibjsi.ORG_BRANCH_CODE like '50*52%' or ibei.supervise_org_code like '50*73%'
+            </if>
             <if test="dto.regionCode != null and dto.regionCode != ''">
                 and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
                 )

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/RescueStationMapper.xml

@@ -58,4 +58,38 @@
 
  </select>
 
+    <select id="getRescueStationList" resultType="com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation">
+		SELECT
+			trs.*
+		FROM
+			tcb_rescue_station trs
+				LEFT JOIN tz_base_enterprise_info ibei ON ibei.sequence_nbr = trs.affiliated_unit_id
+		WHERE
+
+		   trs.is_delete = 'false'
+		<if test="dto.orgCode != '50*18667'">
+			and ibei.supervise_org_code like concat(#{dto.orgCode},'%')
+		</if>
+		<if test="dto.orgCode == '50*18667'">
+			and ibei.supervise_org_code like '50*52%' or ibei.supervise_org_code like '50*73%'
+		</if>
+		<if test="dto.name != null and dto.name != ''">
+			and trs.name like concat('%',#{dto.name},'%')
+		</if>
+		<if test="dto.address != null and dto.address != ''">
+			and trs.address like concat('%',#{dto.address},'%')
+		</if>
+		<if test="dto.principal != null and dto.principal != ''">
+			and trs.principal like concat('%',#{dto.principal},'%')
+		</if>
+		<if test="dto.regionCode != null and dto.regionCode != ''">
+			and trs.region_code like concat('%',#{dto.regionCode},'%')
+		</if>
+		<if test="dto.rescueLeader != null and dto.rescueLeader != ''">
+			and trs.rescue_leader like concat('%',#{dto.rescueLeader},'%')
+		</if>
+		<if test="dto.rescueLeaderPhone != null and dto.rescueLeaderPhone != ''">
+			and trs.rescue_leader_phone = #{dto.rescueLeaderPhone}
+		</if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -15,6 +15,9 @@ import com.yeejoin.amos.boot.module.elevator.api.service.IMaintenanceUnitService
 import com.yeejoin.amos.boot.module.elevator.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
@@ -24,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -244,6 +248,17 @@ public class MaintenanceUnitController extends BaseController {
         EnterpriseInfo enterpriseInfo = BeanDtoVoUtils.convert(enterpriseInfoDto, EnterpriseInfo.class);
         Page<EnterpriseInfo> pageBean;
         QueryWrapper<EnterpriseInfo> enterpriseInfoQueryWrapper = new QueryWrapper<>();
+        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+        if (companyModels.isEmpty()) {
+            throw new BadRequest("未指定人员归属单位信息");
+        }
+        String orgCode = companyModels.get(0).getOrgCode();
+        if ("50*18667".equals(orgCode)) {
+            enterpriseInfoQueryWrapper.likeRight("supervise_org_code","50*52").or().likeRight("supervise_org_code","50*73");
+        } else {
+            enterpriseInfoQueryWrapper.likeRight("supervise_org_code",orgCode);
+        }
+
         Class<? extends EnterpriseInfo> aClass = enterpriseInfo.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {
@@ -264,7 +279,7 @@ public class MaintenanceUnitController extends BaseController {
                             // 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
                             enterpriseInfoQueryWrapper.like(name, "使用单位");
                         } else {
-                            enterpriseInfoQueryWrapper.like(name, "维保单位");
+                            enterpriseInfoQueryWrapper.like(name, "安装改造维修单位");
                         }
                     } else {
                         String fileValue = (String) o;
@@ -348,11 +363,11 @@ public class MaintenanceUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据名称查询维保单位列表", notes = "根据名称查询维保单位列表")
     public ResponseModel<IPage<MaintenanceUnitNameDto>> queryMaintenanceUnitListWithName(@PathVariable(required =
             false) String unitName) {
-        QueryWrapper<MaintenanceUnit> maintenanceUnitQueryWrapper = new QueryWrapper<>();
-        maintenanceUnitQueryWrapper.select("distinct sequence_nbr,unit_name").like(StringUtils.isNotEmpty(unitName),
-                "unit_name", unitName);
-        Page<MaintenanceUnit> pageBean = new Page<>(0, Long.MAX_VALUE);
-        IPage<MaintenanceUnit> page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
+        QueryWrapper<EnterpriseInfo> enterpriseInfoQueryWrapper = new QueryWrapper<>();
+        enterpriseInfoQueryWrapper.select("distinct sequence_nbr,use_unit").like(StringUtils.isNotEmpty(unitName),
+                "use_unit", unitName).like("unit_type","安装改造维修单位");
+        Page<EnterpriseInfo> pageBean = new Page<>(0, Long.MAX_VALUE);
+        IPage<EnterpriseInfo> page = iEnterpriseInfoService.page(pageBean, enterpriseInfoQueryWrapper);
         IPage<MaintenanceUnitNameDto> maintenanceUnitVoIPage = BeanDtoVoUtils.iPageVoStream(page,
                 MaintenanceUnitNameDto.class);
         return ResponseHelper.buildResponse(maintenanceUnitVoIPage);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RescueStationController.java

@@ -14,8 +14,12 @@ import com.yeejoin.amos.boot.module.elevator.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.RescueStationServiceImpl;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -199,40 +204,21 @@ public class RescueStationController extends BaseController {
     public ResponseModel<IPage<RescueStationDto>> queryRescueStationList(String pageNum, String pageSize,
                                                                         RescueStationDto rescueStationDto) {
         RescueStation rescueStation = BeanDtoVoUtils.convert(rescueStationDto, RescueStation.class);
-        Page<RescueStation> pageBean;
-        QueryWrapper<RescueStation> rescueStationQueryWrapper = new QueryWrapper<>();
-        rescueStationQueryWrapper.eq("is_delete",false);
-        Class<? extends RescueStation> aClass = rescueStation.getClass();
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Object o = field.get(rescueStation);
-                if (o != null) {
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if ("name".equalsIgnoreCase(name) || "address".equalsIgnoreCase(name) || "principal".equalsIgnoreCase(name) || "rescue_leader".equalsIgnoreCase(name) || "rescue_leader_phone".equalsIgnoreCase(name)) {
-                        String fileValue = (String) o;
-                        rescueStationQueryWrapper.like(name, fileValue);
-                    } else if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name) || "affiliated_unit"
-                            .equalsIgnoreCase(name)) {
-                        String fileValue = (String) o;
-                        rescueStationQueryWrapper.eq(name, fileValue);
-                    } else {
-                        String fileValue = (String) o;
-                        rescueStationQueryWrapper.like(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                logger.error(e.getMessage());
-            }
-        });
-        IPage<RescueStation> page;
+        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+        if (companyModels.isEmpty()) {
+            throw new BadRequest("未指定人员归属单位信息");
+        }
+        rescueStationDto.setOrgCode(companyModels.get(0).getOrgCode());
+        IPage<RescueStation> page = new Page<>();
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
+            page.setSize(Long.MAX_VALUE);
+            page.setCurrent(0);
         } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            page.setSize(Integer.parseInt(pageSize));
+            page.setCurrent(Integer.parseInt(pageNum));
         }
-        page = iRescueStationService.page(pageBean, rescueStationQueryWrapper);
-        IPage<RescueStationDto> rescueStationDtoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
+        page = iRescueStationService.getRescueStationList(page,rescueStationDto);
+        IPage<RescueStationDto> rescueStationDtoIPage = ObjectUtils.isEmpty(page)? new Page<>(): BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
         return ResponseHelper.buildResponse(rescueStationDtoIPage);
     }
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java

@@ -24,6 +24,9 @@ import com.yeejoin.amos.boot.module.elevator.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.ElevatorMapper;
 import com.yeejoin.amos.boot.module.elevator.api.service.IElevatorService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -33,6 +36,7 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -307,6 +311,11 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
 
     @Override
     public Page<Map<String, Object>> selectElevators(Page<Map<String, Object>> page, ElevatorDto dto) {
+        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+        if (companyModels.isEmpty()) {
+            throw new BadRequest("未指定人员归属单位信息");
+        }
+        dto.setOrgCode(companyModels.get(0).getOrgCode());
         return elevatorMapper.selectElevators(page, dto);
     }
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/RescueStationServiceImpl.java

 package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.elevator.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.RescueStation;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.RescueStationMapper;
@@ -46,6 +47,11 @@ public class RescueStationServiceImpl extends BaseService<RescueStationDto, Resc
         return baseMapper.selectExportData(ids);
     }
 
+    @Override
+    public IPage<RescueStation> getRescueStationList(IPage<RescueStation> page,RescueStationDto dto) {
+        return rescueStationMapper.getRescueStationList(page,dto);
+    }
+
 
     public Boolean saveRescueStation(RescueStationDto rescueStationDto){
         RescueStation rescueStation = BeanDtoVoUtils.convert(rescueStationDto, RescueStation.class);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties

@@ -6,11 +6,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.210:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.34
+eureka.instance.status-page-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.17:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=172.16.3.17
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456