大屏后端

king-boot-module-ad/src/main/java/org/king/modules/ad/controller/BaseShipInfoController.java

@@ -19,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @Description: 船舶基本信息
@@ -51,10 +52,8 @@ public class BaseShipInfoController extends KingController<BaseShipInfo, IBaseSh
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
-		QueryWrapper<BaseShipInfo> queryWrapper = QueryGenerator.initQueryWrapper(baseShipInfo, req.getParameterMap());
-		Page<BaseShipInfo> page = new Page<>(pageNo, pageSize);
-		IPage<BaseShipInfo> pageList = baseShipInfoService.page(page, queryWrapper);
-		return Result.ok(pageList);
+		List<BaseShipInfo> list = baseShipInfoService.list();
+		return Result.ok(list);
 	}
 	
 	/**

king-boot-module-ad/src/main/java/org/king/modules/ad/controller/StaticalController.java

@@ -1,17 +1,19 @@
 package org.king.modules.ad.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.king.common.api.vo.Result;
-import org.king.modules.ad.entity.AdDeviceCount;
-import org.king.modules.ad.entity.ChargeCount;
-import org.king.modules.ad.service.IAdDeviceService;
-import org.king.modules.ad.service.StaticalService;
+import org.king.modules.ad.entity.*;
+import org.king.modules.ad.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -22,6 +24,15 @@ public class StaticalController {
     @Autowired
     private StaticalService staticalService;
 
+    @Autowired
+    private IAdDeviceFaultReportService adDeviceFaultReportService;
+
+    @Autowired
+    private IAdShipFaultReportService adShipFaultReportService;
+
+    @Autowired
+    private IAdChargingRecordService adChargingRecordService;
+
     @GetMapping(value = "/getDeviceCount")
     public Result<?> getDeviceCount() {
         AdDeviceCount count =staticalService.getDeviceCount();
@@ -33,4 +44,31 @@ public class StaticalController {
         List<ChargeCount> list =staticalService.getChargeData();
         return Result.ok(list);
     }
+
+    @GetMapping(value = "/getDeviceFault")
+    public Result<?> getDeviceFault() {
+        List<AdDeviceFaultReport> list =staticalService.getlist();
+        return Result.ok(list);
+    }
+
+    @GetMapping(value = "/getShipFault")
+    public Result<?> getShipFault() {
+        List<AdShipFaultReport> list =adShipFaultReportService.list(Wrappers.<AdShipFaultReport>lambdaQuery().orderByDesc(AdShipFaultReport::getCreateTime));
+        return Result.ok(list);
+    }
+
+    @GetMapping(value = "/getChargeRecord")
+    public Result<?> getChargeRecord(){
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        List<String> list = new ArrayList<String>();
+        List<AdChargingRecord> chargelist = adChargingRecordService.list(Wrappers.<AdChargingRecord>lambdaQuery().apply("date_format(create_time,'%Y-%m-%d') = '"+df.format(new Date())+"'"));
+        List<AdShipFaultReport> shiplist =adShipFaultReportService.list(Wrappers.<AdShipFaultReport>lambdaQuery().apply("date_format(create_time,'%Y-%m-%d') = '"+df.format(new Date())+"'"));
+        for(AdChargingRecord obj:chargelist){
+            list.add(obj.getShipId());
+        }
+        for(AdShipFaultReport obj:shiplist){
+            list.add(obj.getShipId());
+        }
+        return Result.ok(list);
+    }
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/entity/AdDevice.java

@@ -206,6 +206,7 @@ public class AdDevice implements Serializable {
     @ApiModelProperty(value = "设备当前电量，并非实时电量，更新于每次充电时")
     private java.math.BigDecimal currentConsumption;
 
+    @TableField(exist = false)
     private Integer count;
 
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/entity/AdDeviceFaultReport.java

@@ -49,4 +49,5 @@ public class AdDeviceFaultReport implements Serializable {
     @ApiModelProperty(value = "具体描述")
     private String detail;
 
+    private String name;
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/entity/ChargeCount.java

@@ -9,7 +9,7 @@ public class ChargeCount {
 //   用电总量
     private Integer sum = 0;
 //    充电时间总和
-    private Integer timeTotal = 0;
+    private String timeTotal = "0";
   //统计时间
     private String startTime;
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/AdDeviceFaultReportMapper.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AdDeviceFaultReportMapper extends BaseMapper<AdDeviceFaultReport> {
 
+        List<AdDeviceFaultReport> getlist();
+
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/xml/AdChargingRecordMapper.xml

@@ -64,7 +64,7 @@
 
     </select>
 
-    <select id ="getChargeData">
+    <select id ="getChargeData" resultType="org.king.modules.ad.entity.ChargeCount">
         SELECT
         count( consumption ) count,
         sum( consumption ) sum,
@@ -73,7 +73,7 @@
         ad_charging_record
     </select>
 
-    <select id="getChargeByFive">
+    <select id="getChargeByFive" resultType="org.king.modules.ad.entity.ChargeCount">
         SELECT
         DATE_FORMAT( ad.real_start_time, '%Y-%m-%d' ) startTime,
         Sum(
@@ -87,7 +87,7 @@
         FROM
         ad_charging_record
         WHERE
-        DATE_FORMAT( real_start_time, '%Y-%m-%d' )> DATE_FORMAT( date_sub( now(), INTERVAL 5 DAY ), '%Y-%m-%d' )) ad
+        DATE_FORMAT( real_start_time, '%Y-%m-%d' )> DATE_FORMAT( date_sub( now(), INTERVAL 6 DAY ), '%Y-%m-%d' )) ad
         GROUP BY
         DATE_FORMAT(
         ad.real_start_time,

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/xml/AdDeviceFaultReportMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.king.modules.ad.mapper.AdDeviceFaultReportMapper">
 
+    <select id="getlist" resultType="org.king.modules.ad.entity.AdDeviceFaultReport">
+        SELECT
+        a.id,
+        a.ad_device_id,
+        a.status,
+        a.detail,
+        b.service_name as name
+        FROM
+        ad_device_fault_report a
+        LEFT JOIN ad_device b ON a.ad_device_id = b.id
+    </select>
+
 </mapper>

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/xml/AdDeviceMapper.xml

@@ -2,7 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.king.modules.ad.mapper.AdDeviceMapper">
 
-    <select id="getDeviceCount" resultType="org.king.modules.ad.entity.AdDevice">
+    <resultMap id="BaseResultMap" type="org.king.modules.ad.entity.AdDevice">
+
+        <id column="id" jdbcType="INTEGER" property="id" />
+
+        <result column="type" jdbcType="VARCHAR" property="type" />
+
+        <result column="count" jdbcType="INTEGER" property="count" />
+
+    </resultMap>
+
+    <select id="getDeviceCount" resultMap="BaseResultMap">
         SELECT
         type,
         COUNT( 1 ) count

king-boot-module-ad/src/main/java/org/king/modules/ad/service/IBaseShipInfoService.java

@@ -3,6 +3,8 @@ package org.king.modules.ad.service;
 import org.king.modules.ad.entity.BaseShipInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 船舶基本信息
  * @Author: king-boot

king-boot-module-ad/src/main/java/org/king/modules/ad/service/StaticalService.java

@@ -1,6 +1,7 @@
 package org.king.modules.ad.service;
 
 import org.king.modules.ad.entity.AdDeviceCount;
+import org.king.modules.ad.entity.AdDeviceFaultReport;
 import org.king.modules.ad.entity.ChargeCount;
 
 import java.util.List;
@@ -11,4 +12,6 @@ public interface StaticalService {
 
      List<ChargeCount> getChargeData();
 
+     List<AdDeviceFaultReport> getlist();
+
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/service/impl/BaseShipInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package org.king.modules.ad.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.king.modules.ad.entity.BaseShipInfo;
 import org.king.modules.ad.mapper.BaseShipInfoMapper;
 import org.king.modules.ad.service.IBaseShipInfoService;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@DS("multi-datasource1")
 public class BaseShipInfoServiceImpl extends ServiceImpl<BaseShipInfoMapper, BaseShipInfo> implements IBaseShipInfoService {
 
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/service/impl/StaticalServiceImpl.java

@@ -2,10 +2,9 @@ package org.king.modules.ad.service.impl;
 
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import org.king.modules.ad.entity.AdDevice;
-import org.king.modules.ad.entity.AdDeviceCount;
-import org.king.modules.ad.entity.ChargeCount;
+import org.king.modules.ad.entity.*;
 import org.king.modules.ad.mapper.AdChargingRecordMapper;
+import org.king.modules.ad.mapper.AdDeviceFaultReportMapper;
 import org.king.modules.ad.mapper.AdDeviceMapper;
 import org.king.modules.ad.service.StaticalService;
 import org.springframework.stereotype.Service;
@@ -24,6 +23,9 @@ public class StaticalServiceImpl implements StaticalService {
     @Resource
     private AdChargingRecordMapper adChargingRecordMapper;
 
+    @Resource
+    private AdDeviceFaultReportMapper adDeviceFaultReportMapper;
+
     @Override
     public AdDeviceCount getDeviceCount(){
         AdDeviceCount count = new AdDeviceCount();
@@ -48,4 +50,10 @@ public class StaticalServiceImpl implements StaticalService {
         list.add(chargeCount);
         return list;
     }
+
+    public  List<AdDeviceFaultReport> getlist(){
+        List<AdDeviceFaultReport> list = adDeviceFaultReportMapper.getlist();
+        return list;
+    }
+
 }

king-boot-module-system/src/main/java/org/king/config/ShiroConfig.java

@@ -98,6 +98,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/**/*.ico", "anon");
 
 		filterChainDefinitionMap.put("/staticalCount/**", "anon"); //登录验证码接口排除
+		filterChainDefinitionMap.put("/ad/baseShipInfo/**", "anon");
 		filterChainDefinitionMap.put("/ad/third/**", "anon");