Merge remote-tracking branch 'origin/master'

src/main/java/com/sky/ioc/controller/work/FloorController.java

@@ -43,7 +43,7 @@ public class FloorController {
 
 
 
-    @ApiOperation("楼层概览")
+    @ApiOperation("房间分布")
     @PostMapping("/getFloorList")
     public ReturnMsg getFloorList(@RequestBody IocParam iocParam){
         return spaceService.getFloorList(iocParam);

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/mapper/operation/InvestmentMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface InvestmentMapper extends BaseMapper<Investment> {
 
@@ -21,4 +23,37 @@ public interface InvestmentMapper extends BaseMapper<Investment> {
             " GROUP BY field ORDER BY money desc  limit 1" +
             "</script>")
     Investment  getTopOne(@Param("iocParam")IocParam iocParam);
+    @Select("<script> " +
+            "SELECT  name,sum(money) as money from investment   where 1=1 " +
+            "<if test='iocParam!=null and iocParam.timeRange!=null '>" +
+            "and start_time between #{iocParam.timeRange.startDate} and #{iocParam.timeRange.endDate} " +
+            "</if>" +
+            "<if test='iocParam!=null and iocParam.deptId!=null '>" +
+            " and dept_id = #{iocParam.deptId} " +
+            "</if>" +
+            " GROUP BY name </script>")
+    List<Investment> listByTime(@Param("iocParam")IocParam iocParam);
+
+
+    @Select("<script> " +
+            "SELECT COALESCE(avg(rate_of_return),0) from investment  where 1=1 " +
+            "<if test='iocParam!=null and iocParam.timeRange!=null '>" +
+            "and start_time between #{iocParam.timeRange.startDate} and #{iocParam.timeRange.endDate} " +
+            "</if>" +
+            "<if test='iocParam!=null and iocParam.deptId!=null '>" +
+            " and dept_id = #{iocParam.deptId} " +
+            "</if>" +
+            "</script>")
+    double avgReturnByTime(@Param("iocParam")IocParam iocParam);
+
+    @Select("<script> " +
+            "SELECT  name,sum(money) as money from investment   where name = #{name} " +
+            "<if test='iocParam!=null and iocParam.timeRange!=null '>" +
+            "and start_time between #{iocParam.timeRange.startDate} and #{iocParam.timeRange.endDate} " +
+            "</if>" +
+            "<if test='iocParam!=null and iocParam.deptId!=null '>" +
+            " and dept_id = #{iocParam.deptId} " +
+            "</if>" +
+            " GROUP BY name </script>")
+    Investment getByTimeAndName(@Param("iocParam")IocParam iocParam,@Param("name") String name);
 }

src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java

@@ -1,12 +1,14 @@
 package com.sky.ioc.service.assets.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
 import com.sky.ioc.entity.domain.operation.Asset;
 import com.sky.ioc.entity.domain.operation.Investment;
 import com.sky.ioc.entity.params.IocParam;
+import com.sky.ioc.entity.params.IocTimeRange;
 import com.sky.ioc.mapper.operation.AssetMapper;
 import com.sky.ioc.mapper.operation.InvestmentMapper;
 import com.sky.ioc.service.assets.AssetService;
@@ -213,18 +215,47 @@ public class AssetServiceImpl implements AssetService {
 
     @Override
     public ReturnMsg getAssetAnalysis(IocParam iocParam) {
-        String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
+       // String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
+        List<Investment> investments = investmentMapper.listByTime(iocParam);
         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);
+        List<Label> labels1 = new ArrayList<>();
+        for (int i = 0; i < labKey.length; i++) {
+            Label label = new Label();
+            IocParam iocParam1 = new IocParam();
+            IocTimeRange iocTimeRange = new IocTimeRange();
+            iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
+            iocTimeRange.setEndDate(labKey[i]+" 23:59:00");
+            iocParam1.setTimeRange(iocTimeRange);
+            JSONObject jsonObject = new JSONObject();
+            for (int j = 0; j < investments.size(); j++) {
+               // int i1 = random.nextInt(50, 150);
+                String name = investments.get(j).getName();
+                Investment investment = investmentMapper.getByTimeAndName(iocParam1,name);
+                if(investment!=null){
+                    jsonObject.put("investment"+j,investment.getMoney());
+                }else{
+                    jsonObject.put("investment"+j,0);
+                }
+
+            }
+            double rateReturn = investmentMapper.avgReturnByTime(iocParam1);
+            jsonObject.put("rateReturn",MathUtils.division(rateReturn,1,2));
+            label.setJsonObject(jsonObject);
+            label.setLabel(labKey[i]);
+            labels1.add(label);
+        }
+
+       // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getAssetShareRanking(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
+
         list.add(new Cake("资产1"));
         list.add(new Cake("资产2"));
         list.add(new Cake("资产3"));

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

@@ -68,8 +68,14 @@ public class CarCarbonServiceImpl implements CarCarbonService {
 
     @Override
     public ReturnMsg getVehicleInfo(IocParam iocParam) {
-       // String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
-        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]);
@@ -96,7 +102,7 @@ public class CarCarbonServiceImpl implements CarCarbonService {
             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/carbon/impl/CarbonServiceImpl.java

@@ -337,7 +337,14 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonInfo(IocParam iocParam) {
-        List<Company> companies =  companyMapper.selectList(null);
+        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);
+        /*List<Company> companies =  companyMapper.selectList(null);
         List<String> params = companies.stream().map(Company::getCompanyName).collect(Collectors.toList());
         String[] param = params.toArray(new String[0]);
         String startStr = iocParam.getTimeRange().getStartDate();
@@ -362,7 +369,7 @@ public class CarbonServiceImpl implements CarbonService {
             label.setLabel(labKey[i]);
             list.add(label);
         }
-        return ReturnMsg.ok(list);
+        return ReturnMsg.ok(list);*/
     }
 
     @Override

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/carbon/impl/PrintCarbonServiceImpl.java

@@ -67,7 +67,14 @@ public class PrintCarbonServiceImpl implements PrintCarbonService {
 
     @Override
     public ReturnMsg getPrintInfo(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 +101,7 @@ public class PrintCarbonServiceImpl implements PrintCarbonService {
             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/security/impl/SecurityDoorRecordServiceImpl.java

@@ -80,7 +80,7 @@ public class SecurityDoorRecordServiceImpl implements SecurityDoorRecordService
 
     @Override
     public ReturnMsg pageList(DoorAccessParam doorAccessParam) {
-        if(doorAccessParam.getName()!=null&!doorAccessParam.getName().isEmpty()){
+        if(doorAccessParam.getName()!=null&&!doorAccessParam.getName().isEmpty()){
             doorAccessParam.setName("%"+doorAccessParam.getName()+"%");
         }
         if(doorAccessParam.getEquipment()!=null&&!doorAccessParam.getEquipment().isEmpty()){

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) {