内蒙山洪灾害运维系统版本提交

src/main/java/org/springblade/modules/baseinfo/region/controller/BaseInfoRegionController.java

@@ -69,7 +69,6 @@ public class BaseInfoRegionController extends BladeController {
 	private RedisTemplate redisTemplate;
 
 
-
 	@GetMapping("/children/list")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页")
@@ -95,6 +94,17 @@ public class BaseInfoRegionController extends BladeController {
 		return R.data(null);
 	}
 
+	@GetMapping("/children/list/{parentCode}")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "分页")
+	public R<List<RegionInfoEntity>> childrenList(@PathVariable(name = "parentCode") String parentCode) {
+		LambdaQueryWrapper<RegionInfoEntity> wrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		wrapper.eq(RegionInfoEntity::getIsDeleted, 0);
+		wrapper.eq(RegionInfoEntity::getParentCode, parentCode);
+		List<RegionInfoEntity> list = baseInfoRegionService.list(wrapper);
+		return R.data(list);
+	}
+
 	@GetMapping("/lazy-tree")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "adcd", value = "行政区划代码", paramType = "query", dataType = "string"),
@@ -194,9 +204,9 @@ public class BaseInfoRegionController extends BladeController {
 				DeptRegionEntity deptRegionEntity = deptRegionService.getOne(deptRegionEntityLambdaQueryWrapper);
 				LambdaQueryWrapper<RegionInfoEntity> queryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
 				queryWrapper.eq(RegionInfoEntity::getIsDeleted, 0);
-				if (null == deptRegionEntity){
+				if (null == deptRegionEntity) {
 					queryWrapper.eq(RegionInfoEntity::getAdcd, BusinessConstant.REGION_NM_ADCODE);
-				}else{
+				} else {
 					queryWrapper.eq(RegionInfoEntity::getAdcd, deptRegionEntity.getAdcd());
 				}
 				List<RegionInfoEntity> list = baseInfoRegionService.list(queryWrapper);

src/main/java/org/springblade/modules/baseinfo/rtu/controller/RtuBaseInfoController.java

@@ -52,6 +52,7 @@ import org.springblade.modules.system.service.IDictBizService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -80,6 +81,7 @@ public class RtuBaseInfoController extends BladeController {
 	private final IDeptRegionService deptRegionService;
 	private final IBaseInfoRegionService baseInfoRegionService;
 
+
 	/**
 	 * 分页
 	 */
@@ -173,7 +175,7 @@ public class RtuBaseInfoController extends BladeController {
 			rtuInfoVO.setOrgName(dept.getDeptName());
 		}
 		LambdaQueryWrapper<RtuStatusEntity> statusWwrapper = Wrappers.<RtuStatusEntity>query().lambda();
-		statusWwrapper.eq(RtuStatusEntity::getIsDeleted,0);
+		statusWwrapper.eq(RtuStatusEntity::getIsDeleted, 0);
 		statusWwrapper.eq(RtuStatusEntity::getRtuCode, detail.getRtuCode());
 		RtuStatusEntity statusEntity = rtuManageService.getOne(statusWwrapper);
 		if (null != statusEntity) {
@@ -237,25 +239,51 @@ public class RtuBaseInfoController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入rtuInfoEntity")
-	public R save(@RequestBody RtuInfoEntity rtuInfoEntity) {
+	public R save(@RequestBody RtuInfoDTO dto) {
 		LambdaQueryWrapper<RtuInfoEntity> rtuwrapper = Wrappers.<RtuInfoEntity>query().lambda();
-		rtuwrapper.eq(RtuInfoEntity::getRtuCode, rtuInfoEntity.getRtuCode());
+		rtuwrapper.eq(RtuInfoEntity::getRtuCode, dto.getRtuCode());
 		rtuwrapper.eq(RtuInfoEntity::getIsDeleted, 0L);
 		RtuInfoEntity entity = rtuBaseInfoService.getOne(rtuwrapper);
 		if (null != entity) {
 			return R.fail("测站编码已存在，请确认！");
 		}
 		LambdaQueryWrapper<RegionInfoEntity> wrapper = Wrappers.<RegionInfoEntity>query().lambda();
-		wrapper.eq(RegionInfoEntity::getAdcd, rtuInfoEntity.getAdCode());
+		wrapper.eq(RegionInfoEntity::getAdcd, dto.getAdCode());
 		wrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
 		RegionInfoEntity regionInfoEntity = baseInfoRegionService.getOne(wrapper);
-		rtuInfoEntity.setAdDist(regionInfoEntity.getAdnm());
-		LambdaQueryWrapper<RegionInfoEntity> wrapper2 = Wrappers.<RegionInfoEntity>query().lambda();
-		wrapper2.eq(RegionInfoEntity::getAdcd, regionInfoEntity.getParentCode());
-		wrapper2.eq(RegionInfoEntity::getIsDeleted, 0L);
-		regionInfoEntity = baseInfoRegionService.getOne(wrapper2);
-		rtuInfoEntity.setAdCity(regionInfoEntity.getAdnm());
-		return R.status(rtuBaseInfoService.save(rtuInfoEntity));
+		dto.setAdDist(regionInfoEntity.getAdnm());
+		LambdaQueryWrapper<RegionInfoEntity> citywrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		citywrapper.eq(RegionInfoEntity::getAdcd, regionInfoEntity.getParentCode());
+		citywrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
+		regionInfoEntity = baseInfoRegionService.getOne(citywrapper);
+		dto.setAdCity(regionInfoEntity.getAdnm());
+		dto.setIsRain(0);
+		dto.setIsRiver(0);
+		dto.setIsRes(0);
+		dto.setIsGround(0);
+		dto.setIsVideo(0);
+		if (dto.getSiteKind() != null && dto.getSiteKind().length > 0) {
+			for (String kind : dto.getSiteKind()) {
+				if ("1".equals(kind)) {
+					dto.setIsRain(1);
+				} else if ("2".equals(kind)) {
+					dto.setIsRes(1);
+				} else if ("3".equals(kind)) {
+					dto.setIsGround(1);
+				} else if ("4".equals(kind)) {
+					dto.setIsVideo(1);
+				}
+			}
+		}
+		if (null != dto.getLng() && dto.getLng().trim().length() > 0) {
+			String lng = this.getLng(dto.getLng().trim());
+			dto.setLng(lng);
+		}
+		if (null != dto.getLat() && dto.getLat().trim().length() > 0) {
+			String lat = this.getLat(dto.getLat().trim());
+			dto.setLat(lat);
+		}
+		return R.status(rtuBaseInfoService.save(dto));
 	}
 
 	/**
@@ -263,9 +291,45 @@ public class RtuBaseInfoController extends BladeController {
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入rtuInfoEntity")
-	public R update(@RequestBody RtuInfoEntity rtuInfoEntity) {
-		return R.status(rtuBaseInfoService.updateById(rtuInfoEntity));
+	@ApiOperation(value = "修改", notes = "传入RtuInfoDTO")
+	public R update(@RequestBody RtuInfoDTO dto) {
+		LambdaQueryWrapper<RegionInfoEntity> wrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		wrapper.eq(RegionInfoEntity::getAdcd, dto.getAdCode());
+		wrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
+		RegionInfoEntity regionInfoEntity = baseInfoRegionService.getOne(wrapper);
+		dto.setAdDist(regionInfoEntity.getAdnm());
+		LambdaQueryWrapper<RegionInfoEntity> citywrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		citywrapper.eq(RegionInfoEntity::getAdcd, regionInfoEntity.getParentCode());
+		citywrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
+		regionInfoEntity = baseInfoRegionService.getOne(citywrapper);
+		dto.setAdCity(regionInfoEntity.getAdnm());
+		dto.setIsRain(0);
+		dto.setIsRiver(0);
+		dto.setIsRes(0);
+		dto.setIsGround(0);
+		dto.setIsVideo(0);
+		if (dto.getSiteKind() != null && dto.getSiteKind().length > 0) {
+			for (String kind : dto.getSiteKind()) {
+				if ("1".equals(kind)) {
+					dto.setIsRain(1);
+				} else if ("2".equals(kind)) {
+					dto.setIsRes(1);
+				} else if ("3".equals(kind)) {
+					dto.setIsGround(1);
+				} else if ("4".equals(kind)) {
+					dto.setIsVideo(1);
+				}
+			}
+		}
+		if (null != dto.getLng() && dto.getLng().trim().length() > 0) {
+			String lng = this.getLng(dto.getLng().trim());
+			dto.setLng(lng);
+		}
+		if (null != dto.getLat() && dto.getLat().trim().length() > 0) {
+			String lat = this.getLat(dto.getLat().trim());
+			dto.setLat(lat);
+		}
+		return R.status(rtuBaseInfoService.updateById(dto));
 	}
 
 	/**
@@ -273,10 +337,45 @@ public class RtuBaseInfoController extends BladeController {
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入rtuInfoEntity")
-	public R submit(@RequestBody RtuInfoEntity rtuInfoEntity) {
-
-		return R.status(rtuBaseInfoService.saveOrUpdate(rtuInfoEntity));
+	@ApiOperation(value = "新增或修改", notes = "传入RtuInfoDTO")
+	public R submit(@RequestBody RtuInfoDTO dto) {
+		LambdaQueryWrapper<RegionInfoEntity> wrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		wrapper.eq(RegionInfoEntity::getAdcd, dto.getAdCode());
+		wrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
+		RegionInfoEntity regionInfoEntity = baseInfoRegionService.getOne(wrapper);
+		dto.setAdDist(regionInfoEntity.getAdnm());
+		LambdaQueryWrapper<RegionInfoEntity> citywrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		citywrapper.eq(RegionInfoEntity::getAdcd, regionInfoEntity.getParentCode());
+		citywrapper.eq(RegionInfoEntity::getIsDeleted, 0L);
+		regionInfoEntity = baseInfoRegionService.getOne(citywrapper);
+		dto.setAdCity(regionInfoEntity.getAdnm());
+		dto.setIsRain(0);
+		dto.setIsRiver(0);
+		dto.setIsRes(0);
+		dto.setIsGround(0);
+		dto.setIsVideo(0);
+		if (dto.getSiteKind() != null && dto.getSiteKind().length > 0) {
+			for (String kind : dto.getSiteKind()) {
+				if ("1".equals(kind)) {
+					dto.setIsRain(1);
+				} else if ("2".equals(kind)) {
+					dto.setIsRes(1);
+				} else if ("3".equals(kind)) {
+					dto.setIsGround(1);
+				} else if ("4".equals(kind)) {
+					dto.setIsVideo(1);
+				}
+			}
+		}
+		if (null != dto.getLng() && dto.getLng().trim().length() > 0) {
+			String lng = this.getLng(dto.getLng().trim());
+			dto.setLng(lng);
+		}
+		if (null != dto.getLat() && dto.getLat().trim().length() > 0) {
+			String lat = this.getLat(dto.getLat().trim());
+			dto.setLat(lat);
+		}
+		return R.status(rtuBaseInfoService.saveOrUpdate(dto));
 	}
 
 	/**
@@ -335,4 +434,99 @@ public class RtuBaseInfoController extends BladeController {
 		return R.data(list);
 	}
 
+	private String getLng(String lngText) {
+		ArrayList<String> textArr = new ArrayList<>();
+		textArr.add("");
+		for (int l = 0; l < lngText.length(); l++) {
+			String subtext = lngText.substring(l, l + 1);
+			if (Func.isNumeric(subtext)) {
+				String str = textArr.get(textArr.size() - 1);
+				str += subtext;
+				textArr.set(textArr.size() - 1, str);
+			} else {
+				textArr.add("");
+			}
+		}
+		ArrayList<String> tmp = new ArrayList<>();
+		for (String text : textArr) {
+			if (text.length() > 0) {
+				tmp.add(text);
+			}
+		}
+		if (tmp.size() >= 4) {
+			//度分秒，秒有小数点
+			String v = tmp.get(2) + "." + tmp.get(3);
+			double lat = Double.parseDouble(v);
+			lat = lat / 60.0;
+			v = tmp.get(1);
+			lat = (Double.parseDouble(v) + lat) / 60.0;
+			v = tmp.get(0);
+			lat = Double.parseDouble(v) + lat;
+			return String.format("%.06f", lat);
+		} else if (tmp.size() == 3) {
+			//度分秒
+			String v = tmp.get(2);
+			double lat = Double.parseDouble(v);
+			lat = lat / 60.0;
+			v = tmp.get(1);
+			lat = (Double.parseDouble(v) + lat) / 60.0;
+			v = tmp.get(0);
+			lat = Double.parseDouble(v) + lat;
+			return String.format("%.06f", lat);
+		} else if (tmp.size() == 2) {
+			//度
+			String v = tmp.get(0) + "." + tmp.get(1);
+			double lat = Double.parseDouble(v);
+			return String.format("%.06f", lat);
+		}
+		return null;
+	}
+
+	private String getLat(String latText) {
+		ArrayList<String> textArr = new ArrayList<>();
+		textArr.add("");
+		for (int l = 0; l < latText.length(); l++) {
+			String subtext = latText.substring(l, l + 1);
+			if (Func.isNumeric(subtext)) {
+				String str = textArr.get(textArr.size() - 1);
+				str += subtext;
+				textArr.set(textArr.size() - 1, str);
+			} else {
+				textArr.add("");
+			}
+		}
+		ArrayList<String> tmp = new ArrayList<>();
+		for (String text : textArr) {
+			if (text.length() > 0) {
+				tmp.add(text);
+			}
+		}
+		if (tmp.size() >= 4) {
+			//度分秒，秒有小数点
+			String v = tmp.get(2) + "." + tmp.get(3);
+			double lat = Double.parseDouble(v);
+			lat = lat / 60.0;
+			v = tmp.get(1);
+			lat = (Double.parseDouble(v) + lat) / 60.0;
+			v = tmp.get(0);
+			lat = Double.parseDouble(v) + lat;
+			return String.format("%.06f", lat);
+		} else if (tmp.size() == 3) {
+			//度分秒
+			String v = tmp.get(2);
+			double lat = Double.parseDouble(v);
+			lat = lat / 60.0;
+			v = tmp.get(1);
+			lat = (Double.parseDouble(v) + lat) / 60.0;
+			v = tmp.get(0);
+			lat = Double.parseDouble(v) + lat;
+			return String.format("%.06f", lat);
+		} else if (tmp.size() == 2) {
+			//度
+			String v = tmp.get(0) + "." + tmp.get(1);
+			double lat = Double.parseDouble(v);
+			return String.format("%.06f", lat);
+		}
+		return null;
+	}
 }

src/main/java/org/springblade/modules/baseinfo/rtu/dto/RtuInfoDTO.java

@@ -29,6 +29,9 @@ public class RtuInfoDTO extends RtuInfoEntity {
 	@ApiModelProperty(value = "项目名称")
 	private String projectName;
 
+	@ApiModelProperty(value = "所属盟市行片区划编码")
+	private String adCityCode;
+
 	@ApiModelProperty(value = "行政区划编码")
 	private String adCode;
 
@@ -41,4 +44,18 @@ public class RtuInfoDTO extends RtuInfoEntity {
 	@ApiModelProperty(value = "异常类型")
 	private Integer warnKind;
 
+	@ApiModelProperty(value = "站点类型")
+	private String[] siteKind;
+
+	/**
+	 * 排序,ascending"  descending
+	 */
+	@ApiModelProperty("排序")
+	private String order;
+
+	/**
+	 * 排序字段
+	 */
+	@ApiModelProperty("排序字段")
+	private String prop;
 }

src/main/java/org/springblade/modules/baseinfo/rtu/entity/RtuInfoEntity.java

@@ -318,6 +318,18 @@ public class RtuInfoEntity extends BaseEntity {
 	@ApiModelProperty(value = "太阳能板型号")
 	private String sunPowerModel;
 
+	/**
+	 * 太阳能控制器型号
+	 */
+	@ApiModelProperty(value = "太阳能控制器型号")
+	private String sunPowerControllerModel;
+
+	/**
+	 * 太阳能控制器品牌
+	 */
+	@ApiModelProperty(value = "太阳能控制器品牌")
+	private String sunPowerControllerBrand;
+
 	/**
 	 * SIN卡号
 	 */

src/main/java/org/springblade/modules/baseinfo/rtu/mapper/RtuInfoMapper.xml

@@ -52,7 +52,10 @@
 
         <result column="battery_model" property="batteryModel"/>
         <result column="battery_replace_date" property="batteryReplaceDate"/>
+
         <result column="sun_power_model" property="sunPowerModel"/>
+        <result column="sun_power_controller_brand" property="sunPowerControllerBrand"/>
+        <result column="sun_power_controller_model" property="sunPowerControllerModel"/>
 
         <result column="network_sim_id" property="networkSimId"/>
         <result column="network_payer" property="networkPayer"/>
@@ -115,7 +118,10 @@
 
         <result column="battery_model" property="batteryModel"/>
         <result column="battery_replace_date" property="batteryReplaceDate"/>
+
         <result column="sun_power_model" property="sunPowerModel"/>
+        <result column="sun_power_controller_brand" property="sunPowerControllerBrand"/>
+        <result column="sun_power_controller_model" property="sunPowerControllerModel"/>
 
         <result column="network_sim_id" property="networkSimId"/>
         <result column="network_payer" property="networkPayer"/>

src/main/java/org/springblade/modules/baseinfo/rtu/service/impl/RtuBaseInfoServiceImpl.java

@@ -87,12 +87,12 @@ public class RtuBaseInfoServiceImpl extends BaseServiceImpl<RtuInfoMapper, RtuIn
 	public RtuInfoEntity  getAdcd(RtuInfoEntity rtuInfoEntity) {
 		if (rtuInfoEntity.getAdCity() != null && rtuInfoEntity.getAdDist()!=null) {
 			LambdaQueryWrapper<RegionInfoEntity> wrapper = Wrappers.<RegionInfoEntity>query().lambda();
-			wrapper.eq(RegionInfoEntity::getAdnm, rtuInfoEntity.getAdCity());
+			wrapper.like(RegionInfoEntity::getAdnm, rtuInfoEntity.getAdCity());
 			wrapper.eq(RegionInfoEntity::getIsDeleted, 0);
 			List<RegionInfoEntity> regionInfoEntityList = baseInfoRegionService.list(wrapper);
 			if (null != regionInfoEntityList && regionInfoEntityList.size() == 1) {
 				wrapper = Wrappers.<RegionInfoEntity>query().lambda();
-				wrapper.eq(RegionInfoEntity::getAdnm, rtuInfoEntity.getAdDist());
+				wrapper.like(RegionInfoEntity::getAdnm, rtuInfoEntity.getAdDist());
 				wrapper.eq(RegionInfoEntity::getParentCode, regionInfoEntityList.get(0).getAdcd());
 				wrapper.eq(RegionInfoEntity::getIsDeleted, 0);
 				List<RegionInfoEntity> regionInfoEntityList2 = baseInfoRegionService.list(wrapper);

src/main/java/org/springblade/modules/baseinfo/rtu/vo/RtuInfoVO.java

@@ -122,6 +122,9 @@ public class RtuInfoVO extends RtuInfoEntity {
 	@ApiModelProperty(value = "通讯模式名称")
 	private String satelliteModelText;
 
+	@ApiModelProperty(value = "所属盟市行片区划编码")
+	private String adCityCode;
+
 	/**
 	 * 行政区划
 	 */
@@ -133,4 +136,7 @@ public class RtuInfoVO extends RtuInfoEntity {
 	 */
 	@ApiModelProperty(value = "行政区划名称")
 	private String adnm;
+
+	@ApiModelProperty(value = "站点类型")
+	private String[] siteKind;
 }

src/main/java/org/springblade/modules/baseinfo/rtu/wrapper/RtuInfoWrapper.java

@@ -7,10 +7,16 @@
 package org.springblade.modules.baseinfo.rtu.wrapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.baseinfo.region.entity.RegionInfoEntity;
+import org.springblade.modules.baseinfo.region.service.IBaseInfoRegionService;
 import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.vo.RtuInfoVO;
+import org.springblade.modules.system.service.IDictBizService;
 
 import java.util.*;
 
@@ -27,6 +33,25 @@ public class RtuInfoWrapper extends BaseEntityWrapper<RtuInfoEntity, RtuInfoVO>
 		return new RtuInfoWrapper();
 	}
 
+	private static IDictBizService dictBizService;
+
+	private static IDictBizService getDictBizService() {
+		if (dictBizService == null) {
+			dictBizService = SpringUtil.getBean(IDictBizService.class);
+		}
+		return dictBizService;
+	}
+
+	private static IBaseInfoRegionService  regionService;
+
+	private static IBaseInfoRegionService getRegionService() {
+		if (regionService == null) {
+			regionService = SpringUtil.getBean(IBaseInfoRegionService.class);
+		}
+		return regionService;
+	}
+
+
 	@Override
 	public RtuInfoVO entityVO(RtuInfoEntity entity) {
 		RtuInfoVO rtuInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, RtuInfoVO.class));
@@ -34,34 +59,55 @@ public class RtuInfoWrapper extends BaseEntityWrapper<RtuInfoEntity, RtuInfoVO>
 	}
 
 	public RtuInfoVO entityVO(RtuInfoVO entity) {
+		List<String> siteKinds = new ArrayList<>();
 		String rtuKindDesc = "";
 		if (entity.getIsRain() != null && entity.getIsRain() == 1) {
 			rtuKindDesc = "雨量站";
+			siteKinds.add("1");
 		}
 		if (entity.getIsRes() != null && entity.getIsRes() == 1) {
 			if (rtuKindDesc.length() > 0) {
 				rtuKindDesc += "/";
 			}
 			rtuKindDesc += "水位站";
+			siteKinds.add("2");
 		} else if (entity.getIsRiver() != null && entity.getIsRiver() == 1) {
 			if (rtuKindDesc.length() > 0) {
 				rtuKindDesc += "/";
 			}
 			rtuKindDesc += "水位站";
+			siteKinds.add("2");
 		}
 		if (entity.getIsGround() != null && entity.getIsGround() == 1) {
 			if (rtuKindDesc.length() > 0) {
 				rtuKindDesc += "/";
 			}
 			rtuKindDesc += "墒情站";
+			siteKinds.add("3");
 		}
 		if (entity.getIsVideo() != null && entity.getIsVideo() == 1) {
 			if (rtuKindDesc.length() > 0) {
 				rtuKindDesc += "/";
 			}
 			rtuKindDesc += "视频站";
+			siteKinds.add("4");
 		}
 		entity.setRtuKindDesc(rtuKindDesc);
+		String[] kinds = siteKinds.toArray(new String[siteKinds.size()]);
+		entity.setSiteKind(kinds);
+
+		LambdaQueryWrapper<RegionInfoEntity> regionInfoEntityLambdaQueryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
+		regionInfoEntityLambdaQueryWrapper.eq(RegionInfoEntity::getIsDeleted, 0);
+		regionInfoEntityLambdaQueryWrapper.eq(RegionInfoEntity::getAdcd, entity.getAdCode());
+		RegionInfoEntity regionInfoEntity = getRegionService().getOne(regionInfoEntityLambdaQueryWrapper);
+		if(null != regionInfoEntity) {
+			regionInfoEntityLambdaQueryWrapper = Wrappers.<RegionInfoEntity>query().lambda();
+			regionInfoEntityLambdaQueryWrapper.eq(RegionInfoEntity::getIsDeleted, 0);
+			regionInfoEntityLambdaQueryWrapper.eq(RegionInfoEntity::getAdcd, regionInfoEntity.getParentCode());
+			RegionInfoEntity region = getRegionService().getOne(regionInfoEntityLambdaQueryWrapper);
+			entity.setAdCityCode(region.getAdcd());
+		}
+
 		return entity;
 	}
 }

src/main/java/org/springblade/modules/business/check/order/wrapper/RtuCheckOrderWrapper.java

@@ -21,6 +21,8 @@ import org.springblade.modules.baseinfo.dict.entity.DictInfoEntity;
 import org.springblade.modules.baseinfo.dict.service.IBaseInfoDictService;
 import org.springblade.modules.baseinfo.org.entity.DeptRegionEntity;
 import org.springblade.modules.baseinfo.org.service.IDeptRegionService;
+import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
+import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.business.check.order.entity.CheckOrderInfoEntity;
 import org.springblade.modules.business.check.order.vo.CheckOrderHistroyVO;
 import org.springblade.modules.business.check.order.vo.CheckOrderInfoVO;
@@ -106,6 +108,15 @@ public class RtuCheckOrderWrapper extends BaseEntityWrapper<CheckOrderInfoEntity
 		return rtuWarningService;
 	}
 
+	private static IRtuBaseInfoService rtuBaseInfoService;
+
+	private static IRtuBaseInfoService getRtuBaseInfoService() {
+		if (rtuBaseInfoService == null) {
+			rtuBaseInfoService = SpringUtil.getBean(IRtuBaseInfoService.class);
+		}
+		return rtuBaseInfoService;
+	}
+
 	@Override
 	public CheckOrderInfoVO entityVO(CheckOrderInfoEntity entity) {
 		CheckOrderInfoVO checkOrderInfoVO = Objects.requireNonNull(BeanUtil.copy(entity, CheckOrderInfoVO.class));
@@ -114,35 +125,42 @@ public class RtuCheckOrderWrapper extends BaseEntityWrapper<CheckOrderInfoEntity
 
 
 	public CheckOrderHistroyVO entityVO(CheckOrderHistroyVO vo) {
-		String ancestors = vo.getAncestors();
-		if (null != ancestors && ancestors.length() > 0) {
-			String[] ancestorsList = ancestors.split(",");
-			String adCode;
-			if (ancestorsList.length >= 3) {
-				adCode = ancestorsList[2];
-			} else {
-				adCode = vo.getAdCode();
-			}
-			if (null != adCode) {
-				LambdaQueryWrapper<DeptRegionEntity> wrapper = Wrappers.<DeptRegionEntity>query().lambda();
-				wrapper.eq(DeptRegionEntity::getIsDeleted, 0);
-				wrapper.eq(DeptRegionEntity::getAdcd, adCode);
-				List<DeptRegionEntity> deptRegionEntities = getDeptRegionService().list(wrapper);
-				if (null != deptRegionEntities && deptRegionEntities.size() > 0) {
-					String manageCompany = "";
-					for (DeptRegionEntity deptRegionEntity : deptRegionEntities) {
-						Dept dept = getDeptService().getById(deptRegionEntity.getDeptId());
-						if (null != dept) {
-							if (manageCompany.length() > 0) {
-								manageCompany += " / ";
-							}
-							manageCompany += dept.getDeptName();
-						}
-					}
-					vo.setManageCompany(manageCompany);
-				}
-			}
-		}
+//		String ancestors = vo.getAncestors();
+//		if (null != ancestors && ancestors.length() > 0) {
+//			String[] ancestorsList = ancestors.split(",");
+//			String adCode;
+//			if (ancestorsList.length >= 3) {
+//				adCode = ancestorsList[2];
+//			} else {
+//				adCode = vo.getAdCode();
+//			}
+//			if (null != adCode) {
+//				LambdaQueryWrapper<DeptRegionEntity> wrapper = Wrappers.<DeptRegionEntity>query().lambda();
+//				wrapper.eq(DeptRegionEntity::getIsDeleted, 0);
+//				wrapper.eq(DeptRegionEntity::getAdcd, adCode);
+//				List<DeptRegionEntity> deptRegionEntities = getDeptRegionService().list(wrapper);
+//				if (null != deptRegionEntities && deptRegionEntities.size() > 0) {
+//					String manageCompany = "";
+//					for (DeptRegionEntity deptRegionEntity : deptRegionEntities) {
+//						Dept dept = getDeptService().getById(deptRegionEntity.getDeptId());
+//						if (null != dept) {
+//							if (manageCompany.length() > 0) {
+//								manageCompany += " / ";
+//							}
+//							manageCompany += dept.getDeptName();
+//						}
+//					}
+//					vo.setManageCompany(manageCompany);
+//				}
+//			}
+//		}
+
+		LambdaQueryWrapper<RtuInfoEntity> rtuLambdaQueryWrapper = Wrappers.<RtuInfoEntity>query().lambda();
+		rtuLambdaQueryWrapper.eq(RtuInfoEntity::getIsDeleted, 0);
+		rtuLambdaQueryWrapper.eq(RtuInfoEntity::getRtuCode, vo.getRtuCode());
+		RtuInfoEntity rtuInfoEntity=getRtuBaseInfoService().getOne(rtuLambdaQueryWrapper);
+		vo.setManageCompany(rtuInfoEntity.getManageCompany());
+
 		return vo;
 	}
 
@@ -211,10 +229,10 @@ public class RtuCheckOrderWrapper extends BaseEntityWrapper<CheckOrderInfoEntity
 					for (DeptRegionEntity deptRegionEntity : deptRegionEntities) {
 						Dept dept = getDeptService().getById(deptRegionEntity.getDeptId());
 						if (null != dept) {
-							if (manageCompany.length() > 0) {
-								manageCompany += " / ";
-							}
-							manageCompany += dept.getDeptName();
+//							if (manageCompany.length() > 0) {
+//								manageCompany += " / ";
+//							}
+//							manageCompany += dept.getDeptName();
 							//查找运维公司负责人
 							if (vo.getOrderConfirm() == 0) {
 								LambdaQueryWrapper<User> userLambdaQueryWrapper = Wrappers.<User>query().lambda();
@@ -230,12 +248,20 @@ public class RtuCheckOrderWrapper extends BaseEntityWrapper<CheckOrderInfoEntity
 									}
 								}
 							}
+							//break;
 						}
 					}
-					vo.setManageCompany(manageCompany);
+					//vo.setManageCompany(manageCompany);
 				}
 			}
 		}
+
+		LambdaQueryWrapper<RtuInfoEntity> rtuLambdaQueryWrapper = Wrappers.<RtuInfoEntity>query().lambda();
+		rtuLambdaQueryWrapper.eq(RtuInfoEntity::getIsDeleted, 0);
+		rtuLambdaQueryWrapper.eq(RtuInfoEntity::getRtuCode, vo.getRtuCode());
+		RtuInfoEntity rtuInfoEntity=getRtuBaseInfoService().getOne(rtuLambdaQueryWrapper);
+		vo.setManageCompany(rtuInfoEntity.getManageCompany());
+
 		Duration duration = Func.between(vo.getCreateTime(), new Date());
 		long second = duration.getSeconds();
 		String taskTime = "";

src/main/java/org/springblade/modules/business/equipment/inspection/base/dto/EquipmentInspectionInfoDTO.java

@@ -86,4 +86,16 @@ public class EquipmentInspectionInfoDTO extends EquipmentInspectionInfoEntity {
 	 */
 	@ApiModelProperty(value = "机构ID")
 	private Long deptId;
+
+	/**
+	 * 排序,ascending"  descending
+	 */
+	@ApiModelProperty("排序")
+	private String order;
+
+	/**
+	 * 排序字段
+	 */
+	@ApiModelProperty("排序字段")
+	private String prop;
 }

src/main/java/org/springblade/modules/business/equipment/inspection/base/mapper/EquipmentInspectionMapper.xml

@@ -115,7 +115,33 @@
             and (a.adcd =#{inspectionInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE
             ancestors like concat(concat('%', #{inspectionInfoDTO.adCode}), '%')))
         </if>
-        order by n.rtu_code
+        <choose>
+            <when test="inspectionInfoDTO.order!=null and inspectionInfoDTO.order=='ascending'">
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='beforeRainSeasonReportTime'">
+                    order by n.before_rain_season_report_time
+                </if>
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='rainSeasonFirstReportTime'">
+                    order by n.rain_season_first_report_time
+                </if>
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='rainSeasonSecondReportTime'">
+                    order by n.rain_season_second_report_time
+                </if>
+            </when>
+            <when test="inspectionInfoDTO.order!=null and inspectionInfoDTO.order=='descending'">
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='beforeRainSeasonReportTime'">
+                    order by n.before_rain_season_report_time desc
+                </if>
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='rainSeasonFirstReportTime'">
+                    order by n.rain_season_first_report_time desc
+                </if>
+                <if test="inspectionInfoDTO.prop!=null and inspectionInfoDTO.prop=='rainSeasonSecondReportTime'">
+                    order by n.rain_season_second_report_time desc
+                </if>
+            </when>
+            <otherwise>
+                order by n.rtu_code
+            </otherwise>
+        </choose>
     </select>
 
 

src/main/java/org/springblade/modules/business/rtumanage/controller/RtuManageController.java

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.constant.BusinessConstant;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
@@ -413,6 +414,8 @@ public class RtuManageController extends BladeController {
 			list.add(entity);
 			index += 1;
 		}
+		//ExcelUtil.export(response, "通知公告导出数据", "通知公告数据表", list, NoticeExcel.class);
+
 		ExcelWriter excelWriter = EasyExcel.write(outpath).withTemplate(templateFilePath).excelType(ExcelTypeEnum.XLSX).build();
 		WriteSheet writeSheet = EasyExcel.writerSheet("站点信息统计表").build();
 		excelWriter.write(list, writeSheet);

src/main/java/org/springblade/modules/business/rtumanage/mapper/RtuManageMapper.xml

@@ -83,7 +83,22 @@
         <if test="rtuInfoDTO.adCode!=null">
             and (d.ad_code =#{rtuInfoDTO.adCode} or a.ancestors in (SELECT ancestors FROM data_ad_cd_b WHERE ancestors  like concat(concat('%', #{rtuInfoDTO.adCode}), '%')))
         </if>
-        order by IF(isnull(n.run_status_id),1,0) ,n.run_status_id desc,d.rtu_code asc
+        <choose>
+            <when test="rtuInfoDTO.order!=null and rtuInfoDTO.order=='ascending'">
+                <if test="rtuInfoDTO.prop!=null ">
+                    order by n.last_up_time
+                </if>
+            </when>
+            <when test="rtuInfoDTO.order!=null and rtuInfoDTO.order=='descending'">
+                <if test="rtuInfoDTO.prop!=null ">
+                    order by n.last_up_time desc
+                </if>
+            </when>
+            <otherwise>
+                order by IF(isnull(n.run_status_id),1,0) ,n.run_status_id desc,d.rtu_code asc
+            </otherwise>
+        </choose>
+
     </select>
 
     <select id="selectWarnPage" resultMap="rtuStatusVOResultMap">

src/main/java/org/springblade/modules/manage/entity/RtuInfoTableDataEntity.java

@@ -6,6 +6,7 @@
  */
 package org.springblade.modules.manage.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,7 +23,6 @@ import lombok.Setter;
 @Setter
 @EqualsAndHashCode
 public class RtuInfoTableDataEntity {
-
 	private String index;
 	private String city;
 	private String dist;
@@ -53,6 +53,8 @@ public class RtuInfoTableDataEntity {
 	private String batteryModel;
 	private String batteryReplaceDate;
 	private String sunModel;
+	private String sunPowerControllerBrand;
+	private String sunPowerControllerModel;
 	private String simId;
 	private String simPay;
 	private String simOverdate;

src/main/java/org/springblade/modules/manage/version/controller/VersionManageController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
@@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.*;
 
@@ -48,6 +50,7 @@ import java.util.*;
  * Remark：认为有必要的其他信息
  */
 @RestController
+@Slf4j
 @RequestMapping("galaxy-business/version")
 @RequiredArgsConstructor
 @Api(value = "版本管理模块", tags = "版本管理模块")
@@ -111,7 +114,9 @@ public class VersionManageController extends BladeController {
 		wrapper.eq(VersionInfoEntity::getIsDeleted, 0);
 		VersionInfoEntity versionInfoEntity = versionManageService.getOne(wrapper);
 		String url = apkUrl + "/" + versionInfoEntity.getAppPath() + "/" + versionInfoEntity.getAppName();
-		return url;
+		log.info(url);
+		String html ="<div style='color:red;'><a href='"+url+"'>点击下载安装包</a></div>";
+		return html;
 	}
 
 	@GetMapping("/app")
@@ -128,7 +133,8 @@ public class VersionManageController extends BladeController {
 			String qrPath = apkSavePaht + File.separator + versionInfoEntity.getAppPath() + File.separator + versionInfoEntity.getAppPath() + ".jpg";
 			File file = new File(qrPath);
 			if (!file.exists()) {
-				QRCodeUtils.encode2(qrUrl, versionInfoEntity.getAppPath(), apkSavePaht + File.separator + versionInfoEntity.getAppPath() + File.separator);
+				QRCodeUtils.encode2(url, versionInfoEntity.getAppPath(), apkSavePaht + File.separator + versionInfoEntity.getAppPath() + File.separator);
+				//QRCodeUtils.encode2(qrUrl, versionInfoEntity.getAppPath(), apkSavePaht + File.separator + versionInfoEntity.getAppPath() + File.separator);
 			}
 			String qrurl = apkUrl + "/" + versionInfoEntity.getAppPath() + "/" + versionInfoEntity.getAppPath() + ".jpg";
 			vo.setApkQrUrl(qrurl);

src/main/resources/application-test.yml

@@ -66,7 +66,7 @@ spring:
     topic-etl-ground: topic-etl-ground-data
     topic-etl-promptly-collect:  topic-etl-promptly-collect
   apk:
-    qr-url: http://111.204.228.227:20002/api/galaxy-business/version/app/qr/url
+    qr-url: https://nmwx.dahengsi.com:20001/api/galaxy-business/version/app/qr/url
     url: http://111.204.228.227:20002/app/apk
     save-path: /home/apk
   task-config:

src/main/resources/application.yml

@@ -200,6 +200,7 @@ blade:
     #接口放行
     skip-url:
       - /galaxy-test/**
+      - /galaxy-business/version/app/qr/url
     #授权认证配置
     auth:
       - method: ALL