碳排放 接口还原

src/main/java/com/sky/ioc/entity/domain/parking/IllegalParking.java

@@ -27,6 +27,8 @@ public class IllegalParking {
     /**违规原因*/
     private String illegalReason;
 
+    private Integer deptId;
+
 
 
 }

src/main/java/com/sky/ioc/mapper/IllegalParkingMapper.java

@@ -2,8 +2,28 @@ package com.sky.ioc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sky.ioc.entity.domain.parking.IllegalParking;
+import com.sky.ioc.entity.params.IocParam;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface IllegalParkingMapper extends BaseMapper<IllegalParking> {
+
+
+    @Select("<script>" +
+            "SELECT count(*) as number,dept_id from illegal_parking where 1=1 " +
+            "<if test='iocParam!=null and iocParam.companyId != null '>" +
+            " and company_id=#{iocParam.companyId} " +
+            "</if>"+
+            "<if test='iocParam!=null '>" +
+            " <![CDATA[ and illegal_time > #{iocParam.timeRange.startDate} " +
+            "and illegal_time < #{iocParam.timeRange.endDate} ]]>" +
+            "</if>"+
+            " GROUP BY dept_id" +
+            "</script>")
+    List<Map<String,Object>> listByTimeAndDeptId(@Param("iocParam")IocParam iocParam);
 }

src/main/java/com/sky/ioc/service/carbon/impl/PhotovoltaicServiceImpl.java

@@ -13,6 +13,7 @@ import com.sky.ioc.mapper.space.CompanyMapper;
 import com.sky.ioc.mapper.space.DepartmentMapper;
 import com.sky.ioc.service.carbon.PhotovoltaicService;
 import com.sky.ioc.tool.DateUtil;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.MathUtils;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +68,14 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
 
     @Override
     public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
-        Company company =  companyMapper.selectById(1);
+        String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = lists.toArray(new String[0]);
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+       /* Company company =  companyMapper.selectById(1);
         Department department = departmentMapper.selectById(company.getOfficeId());
         List<Department> departments =departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getParentId,department.getOriId()));
         String[] param = departments.stream().map(Department::getName).collect(Collectors.toList()).toArray(new String[0]);
@@ -94,7 +102,7 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
             labels1.add(label);
         }
        // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
-        return ReturnMsg.ok(labels1);
+        return ReturnMsg.ok(labels1);*/
     }
 
     @Override

src/main/java/com/sky/ioc/service/parking/impl/ParkingServiceImpl.java

@@ -212,8 +212,15 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getStopViolation(IocParam iocParam) {
+
       //  List<Map<String,String>> lists = parkMapper.getListByCompanyIdAndDeptIdAndType(iocParam,1);
+    //    List<Map<String,Object>> lists = illegalParkingMapper.listByTimeAndDeptId(iocParam);
         List<Cake> list = new ArrayList<>();
+       /* for(Map<String,Object> map:lists){
+            Cake cake = new Cake();
+
+        }*/
+
         list.add(new Cake("郑分"));
         list.add(new Cake("北京规划院"));
         list.add(new Cake("中讯院"));

src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -16,10 +16,7 @@ import com.sky.ioc.mapper.space.BuildingRoomMapper;
 import com.sky.ioc.mapper.space.BuildingStationMapper;
 import com.sky.ioc.service.space.BuildingFloorService;
 import com.sky.ioc.service.space.SpaceService;
-import com.sky.ioc.tool.DateUtil;
-import com.sky.ioc.tool.FalseData;
-import com.sky.ioc.tool.GeneralMethod;
-import com.sky.ioc.tool.ReturnMsg;
+import com.sky.ioc.tool.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -224,24 +221,13 @@ public class SpaceServiceImpl implements SpaceService {
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
         DecimalFormat decimalFormat = new DecimalFormat("#.0");
-        Integer result = 0;
+        double result = 0;
         Long totalStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().eq(BuildingStation::getIsDel,0));
         Long usedStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().eq(BuildingStation::getIsDel,0).eq(BuildingStation::getStatus,2));
-        // 创建一个数值格式化对象
-        NumberFormat numberFormat = NumberFormat.getInstance();
-        // 设置精确到小数点后2位
-        numberFormat.setMaximumFractionDigits(0);
-        if (totalStation>0) {
-            result = Integer.parseInt(numberFormat.format((float) usedStation / (float) totalStation * 100));
-        }
+        result = MathUtils.division(usedStation,totalStation,2);
         Long flowStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().eq(BuildingStation::getIsDel,0).eq(BuildingStation::getIsBlock,1));
-
         Long fixedStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().eq(BuildingStation::getIsDel,0).eq(BuildingStation::getIsBlock,0));
-
-        // int siteUsed = random.nextInt(10, 100);
         int meettingUsed = random.nextInt(10, 100);
-       /* int flowCount = random.nextInt(100, 500);
-        int fixedCount = random.nextInt(300, 1000);*/
         int playCount = random.nextInt(100, 500);
         int workCount = random.nextInt(300, 1000);
         while (playCount > workCount) {