管道气查看日志

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java

@@ -43,7 +43,6 @@ public class LngBPortPageVo {
     * 所属国家和地区
     */
     @ApiModelProperty("所属国家和地区")
-    @Trans(type = TransType.CASCADE, id = "0772d128d20f4f80aaafc784adba338a", separator = "/", showFormat = "all")
     private String regionCode;
     /**
     * 吞吐量

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java

@@ -72,7 +72,7 @@ public class BankController {
                 .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName())
                 .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode())
                 .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift())
-                    .orderByDesc(LngBBank::getId)
+                    .orderByDesc(LngBBank::getCode)
                 .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty()));
         IPage<LngBBank> page = bankService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBBankPageVo> pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class);

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java

@@ -73,7 +73,7 @@ public class CountryRegionController {
                 .like(StrUtil.isNotBlank(dto.getFullPath()),LngBRegion::getFullPath,dto.getFullPath())
                 .like(StrUtil.isNotBlank(dto.getValid()),LngBRegion::getValid,dto.getValid())
                 .like(StrUtil.isNotBlank(dto.getNote()),LngBRegion::getNote,dto.getNote())
-                    .orderByDesc(LngBRegion::getId)
+                    .orderByDesc(LngBRegion::getCode)
                 .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty()));
         IPage<LngBRegion> page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBRegionPageVo> pageOutput = ConventPage.getPageOutput(page, LngBRegionPageVo.class);
@@ -173,11 +173,21 @@ public class CountryRegionController {
     @ApiOperation(value = "根据id 查询下级区域")
     public R getRegionByParentId(@RequestParam(required = false) Long pid,@RequestParam(required = false) String excludeType, @RequestParam(required = false) String keyword
     		) {
+    	    List<Long> pidList =  CollectionUtils.newArrayList();
+    	    if(StrUtil.isNotBlank(excludeType) && (pid == null || pid ==0) ){
+    	      	List<LngBRegion> pList = countryRegionService.list(Wrappers.<LngBRegion>query()
+    	      			.lambda().eq(LngBRegion::getRegionTypeCode, excludeType));
+    	      	if(pList != null && pList.size() > 0) {
+    	      		for(LngBRegion p:pList) {
+    	      			pidList.add(p.getId());
+    	      		}
+    	      	}
+    	    }
         List<LngBRegion> regionList = countryRegionService.list(Wrappers.<LngBRegion>query().lambda()
                 .eq(pid != null, LngBRegion::getPid, pid)
                 .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode())
-                .eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE)
+                 .in(pid == null, LngBRegion::getPid, pidList)
-                .ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType)
+                //.ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType)
                 .and(StrUtil.isNotBlank(keyword), x -> {
                     x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword);
                 }));

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java

@@ -1,38 +1,39 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.hutool.core.bean.BeanUtil;
+import java.util.List;
-import cn.hutool.core.util.ObjectUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.model.result.R;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.mdm.dto.AddLngBFeeDto;
+import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto;
+import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.mdm.dto.LngBFeePageDto;
-import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
+import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto;
 import com.xjrsoft.module.mdm.entity.LngBFee;
 import com.xjrsoft.module.mdm.service.IExpenseNameService;
 import com.xjrsoft.module.mdm.vo.LngBFeePageVo;
-
-import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.vo.LngBFeeVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
 * @title: 费用名称

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.pictc.utils.CollectionUtils;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -15,6 +16,7 @@ import com.xjrsoft.module.mdm.dto.LngBStationLngPageDto;
 import com.xjrsoft.module.mdm.dto.UpdateLngBStationLngDto;
 import com.xjrsoft.module.mdm.entity.LngBStationLng;
 import com.xjrsoft.module.mdm.service.ILNGStationService;
+import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
 import com.xjrsoft.module.mdm.vo.LngBStationLngPageVo;
 import com.xjrsoft.module.mdm.vo.LngBStationLngVo;
 import io.swagger.annotations.Api;
@@ -110,4 +112,23 @@ public class LNGStationController {
     public R disable(@Valid @RequestBody List<Long> ids){
         return R.ok(lNGStationService.disable(ids));
     }
+    
+    @GetMapping(value = "/list")
+    @ApiOperation(value="LngBStationLng列表(不分页)")
+    public R list(@Valid LngBStationLngPageDto dto){
+        LambdaQueryWrapper<LngBStationLng> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .like(StrUtil.isNotBlank(dto.getFullName()), LngBStationLng::getFullName, dto.getFullName())
+                .eq(StrUtil.isNotBlank(dto.getValid()), LngBStationLng::getValid, dto.getValid())
+                .eq(StrUtil.isNotBlank(dto.getOwnSign()), LngBStationLng::getOwnSign, dto.getOwnSign())
+                .orderByAsc(LngBStationLng::getSort, LngBStationLng::getCode);
+        List<LngBStationLng> list = lNGStationService.list(queryWrapper);
+     	List<LngBStationLngVo> voList = CollectionUtils.newArrayList();
+        for(LngBStationLng s:list) {
+        		LngBStationLngVo vo = new LngBStationLngVo();
+        		BeanUtil.copyProperties(s, vo);
+        		voList.add(vo);
+        }
+        return R.ok(voList);
+    }
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java

@@ -22,7 +22,6 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.dto.LngBStationPngPageDto;
-import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
 import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto;
 import com.xjrsoft.module.mdm.entity.LngBStationPng;
 import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService;
@@ -135,7 +134,7 @@ public class PipeGasDownloadPointController {
     @ApiOperation(value="根据id查询LngBStationPng数据详细日志")
     @SaCheckPermission("pipeGasDownloadPoint:datalog")
     public R datalog(@RequestParam Long id){
-        List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id);
+        List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBStationPngDto.class,id);
         return R.ok(logs);
     }
 

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java

@@ -1,38 +1,39 @@
 package com.xjrsoft.module.mdm.controller;
 
-import cn.hutool.core.bean.BeanUtil;
+import java.util.List;
-import cn.hutool.core.util.ObjectUtil;
+
-import cn.hutool.core.util.StrUtil;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.model.result.R;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.mdm.dto.AddLngBPngLineDto;
+import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto;
+import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.mdm.dto.LngBPngLinePageDto;
-import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
+import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto;
 import com.xjrsoft.module.mdm.entity.LngBPngLine;
 import com.xjrsoft.module.mdm.service.IPipelineGgasLineService;
 import com.xjrsoft.module.mdm.vo.LngBPngLinePageVo;
-
-import com.xjrsoft.module.datalog.service.DatalogService;
-import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.vo.LngBPngLineVo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
 * @title: 管道气管线
@@ -124,7 +125,7 @@ public class PipelineGgasLineController {
     @ApiOperation(value="根据id查询LngBPngLine数据详细日志")
     @SaCheckPermission("pipelineGgasLine:datalog")
     public R datalog(@RequestParam Long id){
-        List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id);
+        List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBPngLineDto.class,id);
         return R.ok(logs);
     }