batteryRobotSystem.git

parent: a947601b | 补丁 | 提交 | ignore whitespace

whycxzp

2025-03-15 4be5d7232a368f1ca997337f11dd77495b08d246

漂亮的方法命名3

5个文件已修改

	src/main/java/com/whyc/controller/DevInfController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/DevA200TestParamService.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/DevActmTestParamService.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/DevAlarmDataService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/DevInfService.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/whyc/controller/DevInfController.java

@@ -35,19 +35,19 @@

    @ApiOperation(value = "获取设备信息(不分页用于包机组)")
    @GetMapping("getDinf")
    public Response getDinf(){
        return service.getDinf();
    public Response getDevInf(){
        return service.getDevInf();
    }
    @ApiOperation(value = "根据设备id获取设备信息")
    @GetMapping("getDinfById")
    public Response getDinfById(@RequestParam Integer devId){
        return service.getDinfById(devId);
    public Response getDevInfById(@RequestParam Integer devId){
        return service.getDevInfById(devId);
    }

    @ApiOperation(value = "获取左侧列表")
    @GetMapping("getDevBytype")
    public Response getDevBytype(@RequestParam(required = false) Integer devType){
        return service.getDevBytype(devType);
    public Response getDevByType(@RequestParam(required = false) Integer devType){
        return service.getDevByType(devType);
    }

    @ApiOperation(value = "新获取左侧列表")
@@ -65,8 +65,8 @@

    @ApiOperation(value = "删除设备(同时删除实时和包机组信息)")
    @GetMapping("delDinf")
    public Response delDinf( Integer devId){
        return service.delDinf(devId);
    public Response delDevInf( Integer devId){
        return service.delDevInf(devId);
    }

    @ApiOperation(value = "强制移除批量设备")

 src/main/java/com/whyc/service/DevA200TestParamService.java

@@ -33,7 +33,7 @@
    private DevA200TestParamMapper mapper;

    @Autowired(required = false)
    private DevInfMapper dinfMapper;
    private DevInfMapper devInfMapper;

    private final RestTemplate restTemplate;

@@ -64,7 +64,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
        ResultA200Dto dto= getA200Dto(url);
        if(dto.getCode().equals("200")){
@@ -85,7 +85,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",param.getDevId());
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -137,7 +137,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/startTest";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -150,7 +150,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/pauseTest";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -163,7 +163,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/stopTest";
        ResultA200Dto dto= getA200Dto(url);
        return dto;
@@ -197,7 +197,7 @@
            UpdateWrapper wrapper=new UpdateWrapper();
            wrapper.eq("dev_id",devId);
            wrapper.set("batch_state",1);
            dinfMapper.update(null,wrapper);
            devInfMapper.update(null,wrapper);
            map.put(devId,dto);
        }
        return new Response().setII(1,true,map,"批量控制a200一体机");
@@ -240,7 +240,7 @@
            UpdateWrapper wrapper=new UpdateWrapper();
            wrapper.eq("dev_id",devId);
            wrapper.set("batch_state",1);
            dinfMapper.update(null,wrapper);
            devInfMapper.update(null,wrapper);
            map.put(devId,dto);
        }
        return new Response().setII(1,true,map,"批量控制a200一体机");

 src/main/java/com/whyc/service/DevActmTestParamService.java

@@ -32,7 +32,7 @@
    private DevActmTestParamMapper mapper;

    @Autowired(required = false)
    private DevInfMapper dinfMapper;
    private DevInfMapper devInfMapper;

    private final RestTemplate restTemplate;

@@ -46,7 +46,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -69,7 +69,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",param.getDevId());
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -126,7 +126,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
@@ -171,7 +171,7 @@
                    UpdateWrapper wrapper=new UpdateWrapper();
                    wrapper.eq("dev_id",devId);
                    wrapper.set("batch_state",1);
                    dinfMapper.update(null,wrapper);
                    devInfMapper.update(null,wrapper);
                }
                map.put(devId,dto);
        }
@@ -198,7 +198,7 @@
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",param.getDevId());
        wrapper.last("limit 1");
        DevInf dinf=dinfMapper.selectOne(wrapper);
        DevInf dinf=devInfMapper.selectOne(wrapper);
        String url="http://"+dinf.getDevIp()+":8080/webService/setBatteryStorageNumber";
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();

 src/main/java/com/whyc/service/DevAlarmDataService.java

@@ -30,7 +30,7 @@
    private SubTablePageInfoUtil service;

    @Autowired(required = false)
    private UserInfService uinfService;
    private UserInfService uerInfService;

    //获取设备告警信息
    public Response getDevAlmInf(int uid, DalmDto dto) {
@@ -38,7 +38,7 @@
        dto.setUid(uid);
        List<DevAlarmData> list=mapper.getDevAlmInf(dto);
        for (DevAlarmData data:list) {
            UserInf uinf=uinfService.getUinfByUId(data.getConfirmedUid());
            UserInf uinf=uerInfService.getUinfByUId(data.getConfirmedUid());
            data.setConfirmedUname(uinf!=null?uinf.getUname():"");
            int almId=data.getAlmId();
            data.setAlmName(DevAlmEnum.getValue(almId));

 src/main/java/com/whyc/service/DevInfService.java

@@ -34,7 +34,7 @@
    private ActmRealStateMapper actmMapper;

    @Autowired(required = false)
    private BattGroupBaojiGroupMapper battBjmapper;
    private BattGroupBaojiGroupMapper battBaojiMapper;

    //添加设备
    @Transactional
@@ -55,7 +55,7 @@
                    listBj.add(baojigroup);
                }
                //将设备添加进指定的包机组
                battBjmapper.insertBatchSomeColumn(listBj);
                battBaojiMapper.insertBatchSomeColumn(listBj);
            }
        }
        return new Response().set(1,bl>0);
@@ -106,7 +106,7 @@
    }

    //获取左侧列表
    public Response getDevBytype(Integer devType) {
    public Response getDevByType(Integer devType) {
        QueryWrapper wrapper=new QueryWrapper();
        if (devType!=null){
            wrapper.eq("dev_type",devType);
@@ -149,7 +149,7 @@
        return new Response().set(1,flag>0,"编辑设备信息");
    }
    //获取设备信息(不分页用于包机组)
    public Response getDinf() {
    public Response getDevInf() {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.orderByAsc("dev_id");
        List<DevInf> list=mapper.selectList(wrapper);
@@ -157,7 +157,7 @@
    }

    //根据设备id获取设备信息
    public Response getDinfById(Integer devId) {
    public Response getDevInfById(Integer devId) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        wrapper.last("limit 1");
@@ -166,11 +166,11 @@
    }
    //删除设备(同时删除实时和包机组信息)
    @Transactional
    public Response delDinf(Integer devId) {
    public Response delDevInf(Integer devId) {
        //先删除包机组信息
        UpdateWrapper baojiWrapper=new UpdateWrapper();
        baojiWrapper.eq("dev_id",devId);
        battBjmapper.delete(baojiWrapper);
        battBaojiMapper.delete(baojiWrapper);
        //再删除实时信息
        if(devId/100000000==1){
            UpdateWrapper a200Wrapper=new UpdateWrapper();

			@@ -35,19 +35,19 @@

			@ApiOperation(value = "获取设备信息(不分页用于包机组)")
			@GetMapping("getDinf")
			public Response getDinf(){
			return service.getDinf();
			public Response getDevInf(){
			return service.getDevInf();
			}
			@ApiOperation(value = "根据设备id获取设备信息")
			@GetMapping("getDinfById")
			public Response getDinfById(@RequestParam Integer devId){
			return service.getDinfById(devId);
			public Response getDevInfById(@RequestParam Integer devId){
			return service.getDevInfById(devId);
			}

			@ApiOperation(value = "获取左侧列表")
			@GetMapping("getDevBytype")
			public Response getDevBytype(@RequestParam(required = false) Integer devType){
			return service.getDevBytype(devType);
			public Response getDevByType(@RequestParam(required = false) Integer devType){
			return service.getDevByType(devType);
			}

			@ApiOperation(value = "新获取左侧列表")
			@@ -65,8 +65,8 @@

			@ApiOperation(value = "删除设备(同时删除实时和包机组信息)")
			@GetMapping("delDinf")
			public Response delDinf( Integer devId){
			return service.delDinf(devId);
			public Response delDevInf( Integer devId){
			return service.delDevInf(devId);
			}

			@ApiOperation(value = "强制移除批量设备")

			@@ -33,7 +33,7 @@
			private DevA200TestParamMapper mapper;

			@Autowired(required = false)
			private DevInfMapper dinfMapper;
			private DevInfMapper devInfMapper;

			private final RestTemplate restTemplate;

			@@ -64,7 +64,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
			ResultA200Dto dto= getA200Dto(url);
			if(dto.getCode().equals("200")){
			@@ -85,7 +85,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",param.getDevId());
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -137,7 +137,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/startTest";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -150,7 +150,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/pauseTest";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -163,7 +163,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/stopTest";
			ResultA200Dto dto= getA200Dto(url);
			return dto;
			@@ -197,7 +197,7 @@
			UpdateWrapper wrapper=new UpdateWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.set("batch_state",1);
			dinfMapper.update(null,wrapper);
			devInfMapper.update(null,wrapper);
			map.put(devId,dto);
			}
			return new Response().setII(1,true,map,"批量控制a200一体机");
			@@ -240,7 +240,7 @@
			UpdateWrapper wrapper=new UpdateWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.set("batch_state",1);
			dinfMapper.update(null,wrapper);
			devInfMapper.update(null,wrapper);
			map.put(devId,dto);
			}
			return new Response().setII(1,true,map,"批量控制a200一体机");

			@@ -32,7 +32,7 @@
			private DevActmTestParamMapper mapper;

			@Autowired(required = false)
			private DevInfMapper dinfMapper;
			private DevInfMapper devInfMapper;

			private final RestTemplate restTemplate;

			@@ -46,7 +46,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -69,7 +69,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",param.getDevId());
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -126,7 +126,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
			@@ -171,7 +171,7 @@
			UpdateWrapper wrapper=new UpdateWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.set("batch_state",1);
			dinfMapper.update(null,wrapper);
			devInfMapper.update(null,wrapper);
			}
			map.put(devId,dto);
			}
			@@ -198,7 +198,7 @@
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",param.getDevId());
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			DevInf dinf=devInfMapper.selectOne(wrapper);
			String url="http://"+dinf.getDevIp()+":8080/webService/setBatteryStorageNumber";
			//将请求头部和参数合成一个请求
			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();

			@@ -30,7 +30,7 @@
			private SubTablePageInfoUtil service;

			@Autowired(required = false)
			private UserInfService uinfService;
			private UserInfService uerInfService;

			//获取设备告警信息
			public Response getDevAlmInf(int uid, DalmDto dto) {
			@@ -38,7 +38,7 @@
			dto.setUid(uid);
			List<DevAlarmData> list=mapper.getDevAlmInf(dto);
			for (DevAlarmData data:list) {
			UserInf uinf=uinfService.getUinfByUId(data.getConfirmedUid());
			UserInf uinf=uerInfService.getUinfByUId(data.getConfirmedUid());
			data.setConfirmedUname(uinf!=null?uinf.getUname():"");
			int almId=data.getAlmId();
			data.setAlmName(DevAlmEnum.getValue(almId));

			@@ -34,7 +34,7 @@
			private ActmRealStateMapper actmMapper;

			@Autowired(required = false)
			private BattGroupBaojiGroupMapper battBjmapper;
			private BattGroupBaojiGroupMapper battBaojiMapper;

			//添加设备
			@Transactional
			@@ -55,7 +55,7 @@
			listBj.add(baojigroup);
			}
			//将设备添加进指定的包机组
			battBjmapper.insertBatchSomeColumn(listBj);
			battBaojiMapper.insertBatchSomeColumn(listBj);
			}
			}
			return new Response().set(1,bl>0);
			@@ -106,7 +106,7 @@
			}

			//获取左侧列表
			public Response getDevBytype(Integer devType) {
			public Response getDevByType(Integer devType) {
			QueryWrapper wrapper=new QueryWrapper();
			if (devType!=null){
			wrapper.eq("dev_type",devType);
			@@ -149,7 +149,7 @@
			return new Response().set(1,flag>0,"编辑设备信息");
			}
			//获取设备信息(不分页用于包机组)
			public Response getDinf() {
			public Response getDevInf() {
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.orderByAsc("dev_id");
			List<DevInf> list=mapper.selectList(wrapper);
			@@ -157,7 +157,7 @@
			}

			//根据设备id获取设备信息
			public Response getDinfById(Integer devId) {
			public Response getDevInfById(Integer devId) {
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			@@ -166,11 +166,11 @@
			}
			//删除设备(同时删除实时和包机组信息)
			@Transactional
			public Response delDinf(Integer devId) {
			public Response delDevInf(Integer devId) {
			//先删除包机组信息
			UpdateWrapper baojiWrapper=new UpdateWrapper();
			baojiWrapper.eq("dev_id",devId);
			battBjmapper.delete(baojiWrapper);
			battBaojiMapper.delete(baojiWrapper);
			//再删除实时信息
			if(devId/100000000==1){
			UpdateWrapper a200Wrapper=new UpdateWrapper();