1111

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -846,12 +846,12 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
    @GetMapping(value = "/getBrandsAndManufacturer")
    @ApiOperation("设备品牌以及商家")
    public Envelop getBrandsAndManufacturer() {
        return success(monitorPlatformService.getBrandsAndManufacturer());
    }
    @GetMapping(value = "/getEquipmentStatistics")
    @ApiOperation("设备库存、使用数、总备案、失联率、物联率")
    @ApiOperation("设备库存、使用数、总备案、失联率、物联率-废弃")
    @Deprecated
    public Envelop getEquipmentStatistics(@RequestParam(value = "deviceType", required = true, defaultValue = "1,2,5,22")
                                          @ApiParam(name = "deviceType", value = "设备类型,1血糖仪，2血压计,5健康小屋,22智慧药房", required = true) String deviceType,
                                          @RequestParam(value = "deviceName", required = false, defaultValue = "")
@@ -862,6 +862,29 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        return success(monitorPlatformService.getEquipmentStatistics(deviceType, monitorPlatformService.getDeviceNameByRequestParam(deviceName), showLevel));
    }
    @GetMapping(value = "/getEquipmentStock")
    @ApiOperation("设备库存、使用中、总备案")
    public Envelop getEquipmentStock() {
        try {
            return success(monitorPlatformService.getEquipmentStock());
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败");
        }
    }
    @ApiOperation("设备组合方式和设备网络传输")
    @RequestMapping(value = "combinationMethodAndWeb", method = RequestMethod.GET)
    public Envelop combinationMethodAndWeb() {
        try {
            return success(monitorPlatformService.combinationMethodAndWeb());
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
        }
    }
    @ApiOperation("大屏应用服务")
    @RequestMapping(value = "/getAppService", method = RequestMethod.GET)
    public Envelop getAppService() {

svr/svr-iot/src/main/java/com/yihu/iot/dao/statistics/IotStatisticsCommonDao.java

@@ -0,0 +1,12 @@
package com.yihu.iot.dao.statistics;
import com.yihu.jw.entity.iot.statistics.IotStatisticsCommonDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2023/5/5.
 */
public interface IotStatisticsCommonDao extends PagingAndSortingRepository<IotStatisticsCommonDO,String>,
        JpaSpecificationExecutor<IotStatisticsCommonDO> {
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/statistics/IotStatisticsStockDao.java

@@ -0,0 +1,12 @@
package com.yihu.iot.dao.statistics;
import com.yihu.jw.entity.iot.statistics.IotStatisticsStockDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2023/5/6.
 */
public interface IotStatisticsStockDao extends PagingAndSortingRepository<IotStatisticsStockDO,String>,
        JpaSpecificationExecutor<IotStatisticsStockDO> {
}

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.dao.statistics.IotStatisticsCommonDao;
import com.yihu.iot.service.analyzer.WlyyIotTzDict;
import com.yihu.iot.service.analyzer.WlyyIotTzDictDao;
import com.yihu.iot.service.common.MyJdbcTemplate;
@@ -16,6 +17,7 @@ import com.yihu.iot.util.conceal.ConcealUtil;
import com.yihu.iot.util.excel.HibenateUtils;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.jw.entity.iot.statistics.IotStatisticsCommonDO;
import com.yihu.jw.entity.iot.statistics.IotStatisticsRealtimeDO;
import com.yihu.jw.entity.util.AesEncryptUtils;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -83,6 +85,8 @@ public class MonitorPlatformService {
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private WlyyIotTzDictDao wlyyIotTzDictDao;
    @Autowired
    private IotStatisticsCommonDao iotStatisticsCommonDao;
    /**
     * 获取位置信息
@@ -1244,6 +1248,32 @@ public class MonitorPlatformService {
        }
    }
    //入驻设备管理
    public JSONObject onboardingDeviceManagement(String parentType){
        JSONObject result = new JSONObject();
        try {
        }catch (Exception e){
            e.printStackTrace();
        }
        return result;
    }
    //设备库存、使用中、总备案、物联率、失联率
    public List<Map<String,Object>> getEquipmentStock(){
        List<Map<String,Object>> result = new ArrayList<>();
        try {
            String sql = "SELECT name,type,total,useing,stock from iot_statistics_stock WHERE parent_type = '0' and town = '350200'";
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            return list;
        }catch (Exception e){
            e.printStackTrace();
        }
        return result;
    }
    /**
     * 谁设备库存、使用中、总备案、物联率、失联率
     *
@@ -1459,6 +1489,21 @@ public class MonitorPlatformService {
        }
    }
    //设备组合方式和设备网络传输
    public JSONObject combinationMethodAndWeb(){
        JSONObject json = new JSONObject();
        IotStatisticsCommonDO iotStatisticsCommonDO1 = iotStatisticsCommonDao.findOne("Combination_method1");
        IotStatisticsCommonDO iotStatisticsCommonDO2 = iotStatisticsCommonDao.findOne("Combination_method2");
        JSONObject Combination_method1 = JSONObject.parseObject(iotStatisticsCommonDO1.getContent());
        JSONObject Combination_method2 = JSONObject.parseObject(iotStatisticsCommonDO2.getContent());
        json.put("Combination_method1",Combination_method1);//设备组合方式
        json.put("Combination_method2",Combination_method2);//设备网络传输
        return json;
    }
    public String getRange(int first, int second, int i) {
        if (second == 0 && first > 0) {
            return "100";